aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/types.h
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2012-12-25 17:03:24 +0800
committerAntonio Quartulli <ordex@autistici.org>2013-01-19 21:18:11 +0800
commitbae987747150d8939bf385863f49e2647db15e2a (patch)
tree863f4d9a2cbafc326c5975966316276f2ffb4a68 /net/batman-adv/types.h
parentbatman-adv: rename batadv_recvlist_node struct to make clear it is used by vis (diff)
downloadlinux-dev-bae987747150d8939bf385863f49e2647db15e2a.tar.xz
linux-dev-bae987747150d8939bf385863f49e2647db15e2a.zip
batman-adv: rename batadv_backbone_gw struct to make clear it is used by bla
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to '')
-rw-r--r--net/batman-adv/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index c56e0d904dac..eb3d12914043 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -340,7 +340,7 @@ struct batadv_socket_packet {
};
#ifdef CONFIG_BATMAN_ADV_BLA
-struct batadv_backbone_gw {
+struct batadv_bla_backbone_gw {
uint8_t orig[ETH_ALEN];
short vid; /* used VLAN ID */
struct hlist_node hash_entry;
@@ -356,7 +356,7 @@ struct batadv_backbone_gw {
struct batadv_claim {
uint8_t addr[ETH_ALEN];
short vid;
- struct batadv_backbone_gw *backbone_gw;
+ struct batadv_bla_backbone_gw *backbone_gw;
unsigned long lasttime; /* last time we heard of claim (locals only) */
struct rcu_head rcu;
atomic_t refcount;