[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-for-davem has been updated
to e0c9c62a8ed58bf1fb56bc956297b2ad46c1c149 (tag)
from 02dac3f34243649722c61e7099b705addb1d1b1e (which is now obsolete)
tagging af5d4f7737963f2112f148f97c5820425f050650 (commit)
replaces v3.7-rc7
tagged by Antonio Quartulli
on Fri Nov 30 11:13:00 2012 +0100
- Shortlog ------------------------------------------------------------
Included changes:
- Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQuIa1AAoJEADl0hg6qKeOqN8QAMZ/pEhhIjxQ/8Icde1dccbh
IuGBtm1Nhx6dvfWxzAKx1JQ5GIJMrKFNR+er4bMEJHgsUtBW08pjMVFAzqzPV3Bb
YMVQSJtnbl39obzWMjnsvbAhB2cOC04BAnFlCapKOAeQGWmNrYwZHmq1yrjQhq+F
xOPUqMQ94CrecGGtXOrqCTEJL7Y6VJngu15A8ZGXQBeOKPlmfLUpA4wVG2f7n0cT
aTv7sD46wmJ4YzFCmqd25ugKWCvtmslMg+ryY+NrZYVXlptMTsuF8JTcfqopne+5
3KaIsQzdXPciM4PGuNmJC+C83kiQulmoeQav+LNvdq+r/suJLcELsxwsEH58amfc
Qs80mXfd0Pnop1eORHvaTtNKMd/lkTJ6ydOVIW2dwN32VSPUaCxC0VopeERInKP+
+1flCMT8e/CB7dFHH4lvjYbg9R30VZU2oQo8G3EFMRWzybbvphrM5ITax5aHdy6e
sDzgwoBAdg9E6UvqLOcwkCeSVwyG9GYhk/JwpYVm9sKsVeqkCLLR9+mJjHv9iwqn
h76jqJpwfpDHoDXBEvIQCNcN63B2XqzJGtyhWL3wrS+kAKrxnTONYJbqbugM3sJd
lJjAFlCHR1xgeP1vZ8D+N2zM4CNR73AOHdKAUPUfyfJhJxcjpQpNpK26CDuKpNC9
gNJ31BjiZPkjGXRd9NXf
=hrO7
-----END PGP SIGNATURE-----
Antonio Quartulli (25):
batman-adv: use check_unicast_packet() in recv_roam_adv()
batman-adv: return proper value in case of hash_add failure
batman-adv: properly store the roaming time
batman-adv: print packets re-routing on DBG_TT and ratelimit it
batman-adv: check for more space before accessing the skb
batman-adv: properly convert flag into a boolean value
batman-adv: pass the WIFI flag from the local to global entry
batman-adv: add kernel-doc for enum batadv_dbg_level
batman-adv: add UNICAST_4ADDR packet type
batman-adv: Distributed ARP Table - add a new debug log level
batman-adv: Distributed ARP Table - create DHT helper functions
batman-adv: Distributed ARP Table - implement local storage
batman-adv: Distributed ARP Table - add ARP parsing functions
batman-adv: Distributed ARP Table - add snooping functions for ARP messages
batman-adv: Distributed ARP Table - add compile option
batman-adv: Distributed ARP Table - add runtime switch
batman-adv: enable fast client detection using unicast_4addr packets
batman-adv: fix wrong spinlock inline comment
batman-adv: prevent using any virtual device created on batman-adv as hard-interface
batman-adv: substitute tt_poss_change with a per-tt_entry flag
batman-adv: refactor code to simplify long lines
batman-adv: refactor tt_global_del_struct()
batman-adv: roaming handling mechanism redesign
batman-adv: support array of debugfs general attributes
batman-adv: use ETH_P_BATMAN
David S. Miller (1):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Marek Lindner (2):
batman-adv: split hard_iface struct for each routing protocol
batman-adv: consolidate duplicated primary_if checking code
Martin Hundebøll (2):
batman-adv: Add get_ethtool_stats() support for DAT
batman-adv: Add wrapper to look up neighbor and send skb
Simon Wunderlich (7):
batman-adv: don't allow ECTP traffic on batman-adv
batman-adv: don't rely on positions in struct for hashing
batman-adv: send announcement when backbone gw is registered
batman-adv: allow bla traffic only after first worker period
batman-adv: wait multiple periods before activating bla
batman-adv: fix bla compare function
batman-adv: Fix broadcast duplist for fragmentation
Sven Eckelmann (12):
batman-adv: Remove unused define BAT_ATTR_HIF_UINT
batman-adv: Set special lockdep classes to avoid lockdep warning
batman-adv: Remove extra check in batadv_bit_get_packet
batman-adv: Check return value of try_module_get
batman-adv: Only increase refcounter once for alternate router
batman-adv: Reserve extra bytes in skb for better alignment
batman-adv: Mark correctly aligned headers not as __packed
batman-adv: Remove instant overwritten variable initialization
batman-adv: Mark best gateway in transtable_global debugfs
batman-adv: Add function to calculate crc32c for the skb payload
batman-adv: Start new development cycle
batman-adv: Use packing of 2 for all headers before an ethernet header
-----------------------------------------------------------------------
--
linux integration
9 years, 7 months
[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org
The annotated tag, batman-adv-for-davem has been updated
to 02dac3f34243649722c61e7099b705addb1d1b1e (tag)
from a4dad9f81dfb65ec417228601c319e3358f9d538 (which is now obsolete)
tagging af5d4f7737963f2112f148f97c5820425f050650 (commit)
replaces v3.7-rc7
tagged by Antonio Quartulli
on Fri Nov 30 10:58:04 2012 +0100
- Shortlog ------------------------------------------------------------
Included changes:
- Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_TYPE
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQuIN5AAoJEADl0hg6qKeOiMMP/3X6ZYWgpr1jcFHbBfyCnDao
1AjOhI+/IyNYI8rD0JdlrXONou4aykXCQBqdI72HS7AJZXugileIdYR0Tpf2M7I3
NwTSS+GDEelRN4/X7k9Cbmgz4KakpikZIXT29nnegE3jc8oZFLrUoV78Ove/of3M
4RUywpmOPyzF6woEZPaKn/gDO4NHDbOdeRbUje7IxdAnnDlsy+1R6tilpMlyHNh3
6xOCEHyym6y/xLf2S7gbDEgant9D8i9X16JkA63JaDc7uh6ii8KvnX9t7vzS2O7b
ufoGqzY8OYHOL9+BqIoEP8dwJkuWugloGCxpOjmoVRVXyhHaXiUu8OgtktHaOTkc
rpwNX+4mEi3fYakN0F6hmJJhuqwskLTWN16pCSgBFPntsU3oZJZYs8nZGKGGpM3w
jYEbDrQwDfHt7ytikBGMmukOAICNWFIbGkIVEcq9bDjOhRYYeLYdZaCUc8jD4sgM
wf8zvhs5G6K3QNfjyBAQYJ5SN9IhTgVOj9AuX4tIT6CYMQSVcaNU87X+Te7Q/M9y
TwCEyhbouc4nr/K/byjziF58MeTpkEl+loy8fKrM1D9bueNQQCXkTQ8nK8qTQG9B
nbpBmkpXOrfOWPEfSBkMUNGxwC74K99uLXErhnzQh9DB/4yu5RDsytiVcJ16yCzy
uqBbggZSLhUQ73GuKjd7
=1WC+
-----END PGP SIGNATURE-----
Antonio Quartulli (25):
batman-adv: use check_unicast_packet() in recv_roam_adv()
batman-adv: return proper value in case of hash_add failure
batman-adv: properly store the roaming time
batman-adv: print packets re-routing on DBG_TT and ratelimit it
batman-adv: check for more space before accessing the skb
batman-adv: properly convert flag into a boolean value
batman-adv: pass the WIFI flag from the local to global entry
batman-adv: add kernel-doc for enum batadv_dbg_level
batman-adv: add UNICAST_4ADDR packet type
batman-adv: Distributed ARP Table - add a new debug log level
batman-adv: Distributed ARP Table - create DHT helper functions
batman-adv: Distributed ARP Table - implement local storage
batman-adv: Distributed ARP Table - add ARP parsing functions
batman-adv: Distributed ARP Table - add snooping functions for ARP messages
batman-adv: Distributed ARP Table - add compile option
batman-adv: Distributed ARP Table - add runtime switch
batman-adv: enable fast client detection using unicast_4addr packets
batman-adv: fix wrong spinlock inline comment
batman-adv: prevent using any virtual device created on batman-adv as hard-interface
batman-adv: substitute tt_poss_change with a per-tt_entry flag
batman-adv: refactor code to simplify long lines
batman-adv: refactor tt_global_del_struct()
batman-adv: roaming handling mechanism redesign
batman-adv: support array of debugfs general attributes
batman-adv: use ETH_P_BATMAN
David S. Miller (1):
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Marek Lindner (2):
batman-adv: split hard_iface struct for each routing protocol
batman-adv: consolidate duplicated primary_if checking code
Martin Hundebøll (2):
batman-adv: Add get_ethtool_stats() support for DAT
batman-adv: Add wrapper to look up neighbor and send skb
Simon Wunderlich (7):
batman-adv: don't allow ECTP traffic on batman-adv
batman-adv: don't rely on positions in struct for hashing
batman-adv: send announcement when backbone gw is registered
batman-adv: allow bla traffic only after first worker period
batman-adv: wait multiple periods before activating bla
batman-adv: fix bla compare function
batman-adv: Fix broadcast duplist for fragmentation
Sven Eckelmann (12):
batman-adv: Remove unused define BAT_ATTR_HIF_UINT
batman-adv: Set special lockdep classes to avoid lockdep warning
batman-adv: Remove extra check in batadv_bit_get_packet
batman-adv: Check return value of try_module_get
batman-adv: Only increase refcounter once for alternate router
batman-adv: Reserve extra bytes in skb for better alignment
batman-adv: Mark correctly aligned headers not as __packed
batman-adv: Remove instant overwritten variable initialization
batman-adv: Mark best gateway in transtable_global debugfs
batman-adv: Add function to calculate crc32c for the skb payload
batman-adv: Start new development cycle
batman-adv: Use packing of 2 for all headers before an ethernet header
-----------------------------------------------------------------------
--
linux integration
9 years, 7 months
[linux-merge]linux integration; branch, merge/master, updated. v3.7-rc1-1634-g05d13fc
by postmaster＠open-mesh.org
The following commit has been merged in the merge/master branch:
commit 05d13fc3d3518d6125e28793f6db2b47198a1042
Merge: 76c3bf90141655b220fed95bc194e0518fc05ed1 87907ac0ab83e0d91f0436298af9f87c59dbc62c
Author: Antonio Quartulli <ordex(a)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;
}
--
linux integration
9 years, 7 months
[batctl] master: Merge branch 'next' (2e962f1)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : master
>---------------------------------------------------------------
commit 2e962f1055dcb52441ee2dfea042cac75b785803
Merge: fe3e32e 9ed1b2e
Author: Marek Lindner <lindner_marek(a)yahoo.de>
Date: Fri Nov 30 17:41:28 2012 +0800
Merge branch 'next'
>---------------------------------------------------------------
2e962f1055dcb52441ee2dfea042cac75b785803
packet.h | 2 --
tcpdump.c | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
9 years, 7 months
[batman-adv] master: Merge branch 'next' (72b4ce0)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 72b4ce07d0613b0b6f65171b0e89ef0b5648a6ea
Merge: 1da1935 87907ac
Author: Marek Lindner <lindner_marek(a)yahoo.de>
Date: Fri Nov 30 17:38:54 2012 +0800
Merge branch 'next'
>---------------------------------------------------------------
72b4ce07d0613b0b6f65171b0e89ef0b5648a6ea
compat.h | 2 ++
hard-interface.c | 3 ++-
packet.h | 2 --
send.c | 6 ++++--
soft-interface.c | 9 +++++----
5 files changed, 13 insertions(+), 9 deletions(-)
9 years, 7 months
[batctl] next: batctl: use ETH_P_BATMAN (9ed1b2e)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : next
>---------------------------------------------------------------
commit 9ed1b2edadefb43dfbc881de5fe9d5248cbd66c5
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Mon Nov 26 10:50:17 2012 +0100
batctl: use ETH_P_BATMAN
ETH_P_BATMAN is now defined in linux/if_ether.h. batctl does not need
to use the private BATADV_ETH_P_BATMAN define.
However, depending on the kernel-headers version installed on the
system, this new constant may not be available, therefore a redefinition
inside an ifndef check is needed.
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
>---------------------------------------------------------------
9ed1b2edadefb43dfbc881de5fe9d5248cbd66c5
packet.h | 2 --
tcpdump.c | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/packet.h b/packet.h
index 1c5454d..cb6405b 100644
--- a/packet.h
+++ b/packet.h
@@ -20,8 +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 --git a/tcpdump.c b/tcpdump.c
index 84abd74..4424dfd 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -43,6 +43,9 @@
#include "bat-hosts.h"
#include "functions.h"
+#ifndef ETH_P_BATMAN
+#define ETH_P_BATMAN 0x4305
+#endif /* ETH_P_BATMAN */
#define LEN_CHECK(buff_len, check_len, desc) \
if ((size_t)(buff_len) < (check_len)) { \
@@ -587,7 +590,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read
if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed))
dump_vlan(packet_buff, buff_len, read_opt, time_printed);
break;
- case BATADV_ETH_P_BATMAN:
+ case ETH_P_BATMAN:
batman_ogm_packet = (struct batadv_ogm_packet *)(packet_buff + ETH_HLEN);
if ((read_opt & COMPAT_FILTER) &&
9 years, 7 months
[batman-adv] next: batman-adv: use ETH_P_BATMAN (87907ac)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit 87907ac0ab83e0d91f0436298af9f87c59dbc62c
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Mon Nov 26 00:38:50 2012 +0100
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(a)autistici.org>
Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de>
>---------------------------------------------------------------
87907ac0ab83e0d91f0436298af9f87c59dbc62c
compat.h | 2 ++
hard-interface.c | 3 ++-
packet.h | 2 --
send.c | 6 ++++--
soft-interface.c | 9 +++++----
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/compat.h b/compat.h
index be685aa..e4ebee0 100644
--- a/compat.h
+++ b/compat.h
@@ -166,6 +166,8 @@ static inline void eth_hw_addr_random(struct net_device *dev)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+#define ETH_P_BATMAN 0x4305
+
/* hack for not correctly set mac_len. This may happen for some special
* configurations like batman-adv on VLANs.
*
diff --git a/hard-interface.c b/hard-interface.c
index 365ed74..f1d37cd 100644
--- a/hard-interface.c
+++ b/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)
diff --git a/packet.h b/packet.h
index 1c5454d..cb6405b 100644
--- a/packet.h
+++ b/packet.h
@@ -20,8 +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 --git a/send.c b/send.c
index c7f7023..4425af9 100644
--- a/send.c
+++ b/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;
diff --git a/soft-interface.c b/soft-interface.c
index 54800c7..6b548fd 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -34,6 +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 @@ static int batadv_interface_tx(struct sk_buff *skb,
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 @@ static int batadv_interface_tx(struct sk_buff *skb,
break;
/* fall through */
- case BATADV_ETH_P_BATMAN:
+ case ETH_P_BATMAN:
goto dropped;
}
@@ -302,7 +303,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
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 @@ void batadv_interface_rx(struct net_device *soft_iface,
break;
/* fall through */
- case BATADV_ETH_P_BATMAN:
+ case ETH_P_BATMAN:
goto dropped;
}
9 years, 7 months
[linux-merge]linux integration; annotated tag, v3.7-rc7, created. v3.7-rc7
by postmaster＠open-mesh.org
The annotated tag, v3.7-rc7 has been created
at c4f5fad00840768d96c6999947ca50b8c91e70a6 (tag)
tagging 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (commit)
replaces v3.7-rc6
tagged by Linus Torvalds
on Sun Nov 25 17:59:29 2012 -0800
- Shortlog ------------------------------------------------------------
Linux 3.7-rc7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1
3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD
MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz
asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE
tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+
35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4=
=CPoy
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
9 years, 7 months