diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-30 21:22:04 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-30 21:22:04 +0400 |
| commit | dad52fd964c54aa275ebb5c935ef8d8b0eded74d (patch) | |
| tree | 2695ef8cdaf558e717574d9d61ccae14091b62d2 /net/batman-adv/send.c | |
| parent | ee3f34e857238a4552c68d860348893d7728bcab (diff) | |
| parent | af5d4f7737963f2112f148f97c5820425f050650 (diff) | |
| download | linux-dad52fd964c54aa275ebb5c935ef8d8b0eded74d.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/send.c')
| -rw-r--r-- | net/batman-adv/send.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index c7f702376535..4425af9dad40 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -28,6 +28,8 @@ #include "gateway_common.h" #include "originator.h" +#include <linux/if_ether.h> + static void batadv_send_outstanding_bcast_packet(struct work_struct *work); /* send out an already prepared packet to the given address via the @@ -60,11 +62,11 @@ int batadv_send_skb_packet(struct sk_buff *skb, ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN); memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN); - ethhdr->h_proto = __constant_htons(BATADV_ETH_P_BATMAN); + ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); skb_set_network_header(skb, ETH_HLEN); skb->priority = TC_PRIO_CONTROL; - skb->protocol = __constant_htons(BATADV_ETH_P_BATMAN); + skb->protocol = __constant_htons(ETH_P_BATMAN); skb->dev = hard_iface->net_dev; |