aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/unicast.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 16:19:13 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-28 02:45:00 -0400
commit7e071c79a6964130d1df4dc5ca5a6f3638680fce (patch)
tree5e6260e15caf8cfb14037b526c06a2e578e8a007 /net/batman-adv/unicast.c
parent64346643e86d93805fcb8f722fc4817110be99d8 (diff)
batman-adv: Prefix packet defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/unicast.c')
-rw-r--r--net/batman-adv/unicast.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 472436a06d89..c8da6b0acc38 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -253,7 +253,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
253 memcpy(frag1, &tmp_uc, sizeof(tmp_uc)); 253 memcpy(frag1, &tmp_uc, sizeof(tmp_uc));
254 254
255 frag1->header.ttl--; 255 frag1->header.ttl--;
256 frag1->header.version = COMPAT_VERSION; 256 frag1->header.version = BATADV_COMPAT_VERSION;
257 frag1->header.packet_type = BAT_UNICAST_FRAG; 257 frag1->header.packet_type = BAT_UNICAST_FRAG;
258 258
259 memcpy(frag1->orig, primary_if->net_dev->dev_addr, ETH_ALEN); 259 memcpy(frag1->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
@@ -319,7 +319,7 @@ find_router:
319 319
320 unicast_packet = (struct unicast_packet *)skb->data; 320 unicast_packet = (struct unicast_packet *)skb->data;
321 321
322 unicast_packet->header.version = COMPAT_VERSION; 322 unicast_packet->header.version = BATADV_COMPAT_VERSION;
323 /* batman packet type: unicast */ 323 /* batman packet type: unicast */
324 unicast_packet->header.packet_type = BAT_UNICAST; 324 unicast_packet->header.packet_type = BAT_UNICAST;
325 /* set unicast ttl */ 325 /* set unicast ttl */