diff options
| author |   Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2012-01-22 20:00:18 +0100 |
|---|---|---|
| committer |   Antonio Quartulli <ordex@autistici.org> | 2012-04-11 14:28:58 +0200 |
| commit | a7f6ee9493677ba40625d810258de5bd521cc1b0 (patch) | |
| tree | 6635b87289ae083a466f14d2c9aed4bb20adae34 /net/batman-adv/types.h | |
| parent | batman-adv: encourage batman to take shorter routes by changing the default hop penalty (diff) | |
| download | linux-dev-a7f6ee9493677ba40625d810258de5bd521cc1b0.tar.xz linux-dev-a7f6ee9493677ba40625d810258de5bd521cc1b0.zip | |
batman-adv: remove old bridge loop avoidance code
The functionality is to be replaced by an improved implementation,
so first clean up.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to '')
| -rw-r--r-- | net/batman-adv/types.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 24c8a31a3d91..feac2f4030c8 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -174,7 +174,6 @@ struct bat_priv { struct hlist_head forw_bat_list; struct hlist_head forw_bcast_list; struct hlist_head gw_list; - struct hlist_head softif_neigh_vids; struct list_head tt_changes_list; /* tracks changes in a OGM int */ struct list_head vis_send_list; struct hashtable_t *orig_hash; @@ -191,8 +190,6 @@ struct bat_priv { spinlock_t gw_list_lock; /* protects gw_list and curr_gw */ spinlock_t vis_hash_lock; /* protects vis_hash */ spinlock_t vis_list_lock; /* protects vis_info::recv_list */ - spinlock_t softif_neigh_lock; /* protects soft-interface neigh list */ - spinlock_t softif_neigh_vid_lock; /* protects soft-interface vid list */ atomic_t num_local_tt; /* Checksum of the local table, recomputed before sending a new OGM */ atomic_t tt_crc; @@ -327,24 +324,6 @@ struct recvlist_node { uint8_t mac[ETH_ALEN]; }; -struct softif_neigh_vid { - struct hlist_node list; - struct bat_priv *bat_priv; - short vid; - atomic_t refcount; - struct softif_neigh __rcu *softif_neigh; - struct rcu_head rcu; - struct hlist_head softif_neigh_list; -}; - -struct softif_neigh { - struct hlist_node list; - uint8_t addr[ETH_ALEN]; - unsigned long last_seen; - atomic_t refcount; - struct rcu_head rcu; -}; - struct bat_algo_ops { struct hlist_node list; char *name; |