diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-05 16:31:31 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 16:47:21 -0400 |
commit | 56303d34a332be8e2f4daf7891ebc12cb7900529 (patch) | |
tree | bc972916771e698bd8a88fd66917950ce0bd48c1 /net/batman-adv/soft-interface.c | |
parent | 96412690116afcc1b2705615b5a7c8dc6c5e905f (diff) |
batman-adv: Prefix types structs with batadv_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r-- | net/batman-adv/soft-interface.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0a5d73a549f6..7a7d82185393 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -92,13 +92,13 @@ static int batadv_interface_release(struct net_device *dev) | |||
92 | 92 | ||
93 | static struct net_device_stats *batadv_interface_stats(struct net_device *dev) | 93 | static struct net_device_stats *batadv_interface_stats(struct net_device *dev) |
94 | { | 94 | { |
95 | struct bat_priv *bat_priv = netdev_priv(dev); | 95 | struct batadv_priv *bat_priv = netdev_priv(dev); |
96 | return &bat_priv->stats; | 96 | return &bat_priv->stats; |
97 | } | 97 | } |
98 | 98 | ||
99 | static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) | 99 | static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) |
100 | { | 100 | { |
101 | struct bat_priv *bat_priv = netdev_priv(dev); | 101 | struct batadv_priv *bat_priv = netdev_priv(dev); |
102 | struct sockaddr *addr = p; | 102 | struct sockaddr *addr = p; |
103 | 103 | ||
104 | if (!is_valid_ether_addr(addr->sa_data)) | 104 | if (!is_valid_ether_addr(addr->sa_data)) |
@@ -131,8 +131,8 @@ static int batadv_interface_tx(struct sk_buff *skb, | |||
131 | struct net_device *soft_iface) | 131 | struct net_device *soft_iface) |
132 | { | 132 | { |
133 | struct ethhdr *ethhdr = (struct ethhdr *)skb->data; | 133 | struct ethhdr *ethhdr = (struct ethhdr *)skb->data; |
134 | struct bat_priv *bat_priv = netdev_priv(soft_iface); | 134 | struct batadv_priv *bat_priv = netdev_priv(soft_iface); |
135 | struct hard_iface *primary_if = NULL; | 135 | struct batadv_hard_iface *primary_if = NULL; |
136 | struct batadv_bcast_packet *bcast_packet; | 136 | struct batadv_bcast_packet *bcast_packet; |
137 | struct vlan_ethhdr *vhdr; | 137 | struct vlan_ethhdr *vhdr; |
138 | __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); | 138 | __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); |
@@ -260,10 +260,10 @@ end: | |||
260 | } | 260 | } |
261 | 261 | ||
262 | void batadv_interface_rx(struct net_device *soft_iface, | 262 | void batadv_interface_rx(struct net_device *soft_iface, |
263 | struct sk_buff *skb, struct hard_iface *recv_if, | 263 | struct sk_buff *skb, struct batadv_hard_iface *recv_if, |
264 | int hdr_size) | 264 | int hdr_size) |
265 | { | 265 | { |
266 | struct bat_priv *bat_priv = netdev_priv(soft_iface); | 266 | struct batadv_priv *bat_priv = netdev_priv(soft_iface); |
267 | struct ethhdr *ethhdr; | 267 | struct ethhdr *ethhdr; |
268 | struct vlan_ethhdr *vhdr; | 268 | struct vlan_ethhdr *vhdr; |
269 | short vid __maybe_unused = -1; | 269 | short vid __maybe_unused = -1; |
@@ -338,7 +338,7 @@ static const struct net_device_ops batadv_netdev_ops = { | |||
338 | 338 | ||
339 | static void batadv_interface_setup(struct net_device *dev) | 339 | static void batadv_interface_setup(struct net_device *dev) |
340 | { | 340 | { |
341 | struct bat_priv *priv = netdev_priv(dev); | 341 | struct batadv_priv *priv = netdev_priv(dev); |
342 | 342 | ||
343 | ether_setup(dev); | 343 | ether_setup(dev); |
344 | 344 | ||
@@ -364,7 +364,7 @@ static void batadv_interface_setup(struct net_device *dev) | |||
364 | struct net_device *batadv_softif_create(const char *name) | 364 | struct net_device *batadv_softif_create(const char *name) |
365 | { | 365 | { |
366 | struct net_device *soft_iface; | 366 | struct net_device *soft_iface; |
367 | struct bat_priv *bat_priv; | 367 | struct batadv_priv *bat_priv; |
368 | int ret; | 368 | int ret; |
369 | size_t cnt_len = sizeof(uint64_t) * BATADV_CNT_NUM; | 369 | size_t cnt_len = sizeof(uint64_t) * BATADV_CNT_NUM; |
370 | 370 | ||
@@ -539,7 +539,7 @@ static void batadv_get_ethtool_stats(struct net_device *dev, | |||
539 | struct ethtool_stats *stats, | 539 | struct ethtool_stats *stats, |
540 | uint64_t *data) | 540 | uint64_t *data) |
541 | { | 541 | { |
542 | struct bat_priv *bat_priv = netdev_priv(dev); | 542 | struct batadv_priv *bat_priv = netdev_priv(dev); |
543 | int i; | 543 | int i; |
544 | 544 | ||
545 | for (i = 0; i < BATADV_CNT_NUM; i++) | 545 | for (i = 0; i < BATADV_CNT_NUM; i++) |