* [B.A.T.M.A.N.] [PATCH] batman-adv: replace ethertype variable with ETH_P_BATMAN for readability
@ 2016-03-20 10:39 Marek Lindner
2016-03-20 11:08 ` Sven Eckelmann
0 siblings, 1 reply; 3+ messages in thread
From: Marek Lindner @ 2016-03-20 10:39 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Marek Lindner
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
net/batman-adv/soft-interface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 1c1ed5a..4667719 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -186,7 +186,6 @@ static int batadv_interface_tx(struct sk_buff *skb,
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
struct batadv_hard_iface *primary_if = NULL;
struct batadv_bcast_packet *bcast_packet;
- __be16 ethertype = htons(ETH_P_BATMAN);
static const u8 stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00,
0x00, 0x00};
static const u8 ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00,
@@ -216,7 +215,8 @@ static int batadv_interface_tx(struct sk_buff *skb,
case ETH_P_8021Q:
vhdr = vlan_eth_hdr(skb);
- if (vhdr->h_vlan_encapsulated_proto != ethertype) {
+ /* drop batman-in-batman packets to prevent loops */
+ if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) {
network_offset += VLAN_HLEN;
break;
}
@@ -404,7 +404,6 @@ void batadv_interface_rx(struct net_device *soft_iface,
{
struct batadv_bcast_packet *batadv_bcast_packet;
struct batadv_priv *bat_priv = netdev_priv(soft_iface);
- __be16 ethertype = htons(ETH_P_BATMAN);
struct vlan_ethhdr *vhdr;
struct ethhdr *ethhdr;
unsigned short vid;
@@ -434,7 +433,8 @@ void batadv_interface_rx(struct net_device *soft_iface,
vhdr = (struct vlan_ethhdr *)skb->data;
- if (vhdr->h_vlan_encapsulated_proto != ethertype)
+ /* drop batman-in-batman packets to prevent loops */
+ if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN))
break;
/* fall through */
--
2.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH] batman-adv: replace ethertype variable with ETH_P_BATMAN for readability
2016-03-20 10:39 [B.A.T.M.A.N.] [PATCH] batman-adv: replace ethertype variable with ETH_P_BATMAN for readability Marek Lindner
@ 2016-03-20 11:08 ` Sven Eckelmann
2016-03-27 6:25 ` Marek Lindner
0 siblings, 1 reply; 3+ messages in thread
From: Sven Eckelmann @ 2016-03-20 11:08 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Marek Lindner
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
On Sunday 20 March 2016 18:39:56 Marek Lindner wrote:
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> ---
> net/batman-adv/soft-interface.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Sven Eckelmann <sven@narfation.org>
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH] batman-adv: replace ethertype variable with ETH_P_BATMAN for readability
2016-03-20 11:08 ` Sven Eckelmann
@ 2016-03-27 6:25 ` Marek Lindner
0 siblings, 0 replies; 3+ messages in thread
From: Marek Lindner @ 2016-03-27 6:25 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
On Sunday, March 20, 2016 12:08:24 Sven Eckelmann wrote:
> On Sunday 20 March 2016 18:39:56 Marek Lindner wrote:
> > Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> > ---
> >
> > net/batman-adv/soft-interface.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Reviewed-by: Sven Eckelmann <sven@narfation.org>
Applied in revision ef38843.
Regards,
Marek
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-27 6:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-20 10:39 [B.A.T.M.A.N.] [PATCH] batman-adv: replace ethertype variable with ETH_P_BATMAN for readability Marek Lindner
2016-03-20 11:08 ` Sven Eckelmann
2016-03-27 6:25 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox