Staging: batman-adv: Update copyright years

[pandora-kernel.git] / drivers / staging / batman-adv / types.h

diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index 3a0ef0c..4e77141 100644 (file)
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -39,7 +39,6 @@ struct batman_if {
        char if_active;
        char addr_str[ETH_STR_LEN];
        struct net_device *net_dev;
-       struct socket *raw_sock;
        atomic_t seqno;
        unsigned char *packet_buff;
        int packet_len;
@@ -75,7 +74,7 @@ struct neigh_node {
        uint8_t tq_index;
        uint8_t tq_avg;
        uint8_t last_ttl;
-       unsigned long last_valid;            /* when last packet via this neighbour was received */
+       unsigned long last_valid;            /* when last packet via this neighbor was received */
        TYPE_OF_WORD real_bits[NUM_WORDS];
        struct orig_node *orig_node;
        struct batman_if *if_incoming;
@@ -113,6 +112,7 @@ struct forw_packet {               /* structure for forw_list maintaining packet
        struct hlist_node list;
        unsigned long send_time;
        uint8_t own;
+       struct sk_buff *skb;
        unsigned char *packet_buff;
        uint16_t packet_len;
        uint32_t direct_link_flags;
@@ -121,4 +121,14 @@ struct forw_packet {               /* structure for forw_list maintaining packet
        struct batman_if *if_incoming;
 };
 
+/* While scanning for vis-entries of a particular vis-originator
+ * this list collects its interfaces to create a subgraph/cluster
+ * out of them later
+ */
+struct if_list_entry {
+       uint8_t addr[ETH_ALEN];
+       bool primary;
+       struct hlist_node list;
+};
+
 #endif