The following commit has been merged in the merge/master branch: commit 05d13fc3d3518d6125e28793f6db2b47198a1042 Merge: 76c3bf90141655b220fed95bc194e0518fc05ed1 87907ac0ab83e0d91f0436298af9f87c59dbc62c Author: Antonio Quartulli ordex@autistici.org Date: Fri Nov 30 10:47:24 2012 +0100

Merge remote-tracking branch 'pkg/next' into merge/master

Conflicts: net/batman-adv/compat.h

diff --combined net/batman-adv/hard-interface.c index 365ed74,f1d37cd..f1d37cd --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -30,6 -30,7 +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 +312,7 @@@ int batadv_hardif_enable_interface(stru { 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) diff --combined net/batman-adv/packet.h index 1c5454d,cb6405bf..cb6405bf --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -20,8 -20,6 +20,6 @@@ #ifndef _NET_BATMAN_ADV_PACKET_H_ #define _NET_BATMAN_ADV_PACKET_H_

- #define BATADV_ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ - enum batadv_packettype { BATADV_IV_OGM = 0x01, BATADV_ICMP = 0x02, diff --combined net/batman-adv/send.c index c7f7023,4425af9..4425af9 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@@ -28,6 -28,8 +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 +62,11 @@@ int batadv_send_skb_packet(struct sk_bu 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;

diff --combined net/batman-adv/soft-interface.c index 54800c7,6b548fd..6b548fd --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -34,6 -34,7 +34,7 @@@ #include <linux/ethtool.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> + #include <linux/if_ether.h> #include "unicast.h" #include "bridge_loop_avoidance.h"

@@@ -146,7 -147,7 +147,7 @@@ static int batadv_interface_tx(struct s struct batadv_hard_iface *primary_if = NULL; struct batadv_bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; static const uint8_t ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, @@@ -172,7 -173,7 +173,7 @@@ break;

/* fall through */ - case BATADV_ETH_P_BATMAN: + case ETH_P_BATMAN: goto dropped; }

@@@ -302,7 -303,7 +303,7 @@@ void batadv_interface_rx(struct net_dev struct vlan_ethhdr *vhdr; struct batadv_header *batadv_header = (struct batadv_header *)skb->data; short vid __maybe_unused = -1; - __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN); + __be16 ethertype = __constant_htons(ETH_P_BATMAN); bool is_bcast;

is_bcast = (batadv_header->packet_type == BATADV_BCAST); @@@ -325,7 -326,7 +326,7 @@@ break;

/* fall through */ - case BATADV_ETH_P_BATMAN: + case ETH_P_BATMAN: goto dropped; }