diff options
| author | Antonio Quartulli | 2012-11-26 00:38:50 +0100 |
|---|---|---|
| committer | Antonio Quartulli | 2012-11-30 10:50:22 +0100 |
| commit | af5d4f7737963f2112f148f97c5820425f050650 (patch) | |
| tree | f5d5d7b9fcb172df041b8fb34fad875f0c87b9d5 /net/batman-adv/hard-interface.c | |
| parent | core: make GRO methods static. (diff) | |
| download | kernel-qcow2-linux-af5d4f7737963f2112f148f97c5820425f050650.tar.gz kernel-qcow2-linux-af5d4f7737963f2112f148f97c5820425f050650.tar.xz kernel-qcow2-linux-af5d4f7737963f2112f148f97c5820425f050650.zip | |
batman-adv: use ETH_P_BATMAN
The ETH_P_BATMAN ethertype is now defined kernel-wide. Use it instead
of the private BATADV_ETH_P_BATMAN define.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/hard-interface.c')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 365ed74f3946..f1d37cd81815 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -30,6 +30,7 @@ #include "bridge_loop_avoidance.h" #include <linux/if_arp.h> +#include <linux/if_ether.h> void batadv_hardif_free_rcu(struct rcu_head *rcu) { @@ -311,7 +312,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, { struct batadv_priv *bat_priv; struct net_device *soft_iface; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); int ret; if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) |