diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-05 16:31:30 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 16:47:21 -0400 |
commit | 96412690116afcc1b2705615b5a7c8dc6c5e905f (patch) | |
tree | 0eb2a1a557e2997175b27f3ab925bbdc29ece54d /net/batman-adv/soft-interface.c | |
parent | b4d66b877bc21ce907938bfd027dfe016617fac0 (diff) |
batman-adv: Prefix packet 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0a00324e67e3..0a5d73a549f6 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -133,7 +133,7 @@ static int batadv_interface_tx(struct sk_buff *skb, | |||
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 bat_priv *bat_priv = netdev_priv(soft_iface); |
135 | struct hard_iface *primary_if = NULL; | 135 | struct hard_iface *primary_if = NULL; |
136 | struct 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); |
139 | static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, | 139 | static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, |
@@ -208,7 +208,7 @@ static int batadv_interface_tx(struct sk_buff *skb, | |||
208 | if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0) | 208 | if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0) |
209 | goto dropped; | 209 | goto dropped; |
210 | 210 | ||
211 | bcast_packet = (struct bcast_packet *)skb->data; | 211 | bcast_packet = (struct batadv_bcast_packet *)skb->data; |
212 | bcast_packet->header.version = BATADV_COMPAT_VERSION; | 212 | bcast_packet->header.version = BATADV_COMPAT_VERSION; |
213 | bcast_packet->header.ttl = BATADV_TTL; | 213 | bcast_packet->header.ttl = BATADV_TTL; |
214 | 214 | ||