[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1423130063-18323-1-git-send-email-jouni@codeaurora.org>
Date: Thu, 5 Feb 2015 11:54:21 +0200
From: Jouni Malinen <jouni@...eaurora.org>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org, Kyeyoon Park <kyeyoonp@...eaurora.org>,
Jouni Malinen <jouni@...eaurora.org>
Subject: [PATCH v2 1/3] bridge: Base the BR_PROXYARP decision on the target port flag
From: Kyeyoon Park <kyeyoonp@...eaurora.org>
When doing proxy ARP, instead of checking the bridge port flag for
BR_PROXYARP on the bridge port on which the frame was received, check
the bridge port flag of the bridge port to which the target device
belongs.
Signed-off-by: Kyeyoon Park <kyeyoonp@...eaurora.org>
Signed-off-by: Jouni Malinen <jouni@...eaurora.org>
---
v2: Address Stephen's comment on mixing && and & without parens
and check for f->dst != NULL before dereferencing it
net/bridge/br_input.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index e2aa7be..b2afa17 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -105,7 +105,7 @@ static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br,
}
f = __br_fdb_get(br, n->ha, vid);
- if (f)
+ if (f && f->dst && (f->dst->flags & BR_PROXYARP))
arp_send(ARPOP_REPLY, ETH_P_ARP, sip, skb->dev, tip,
sha, n->ha, sha);
@@ -155,7 +155,6 @@ int br_handle_frame_finish(struct sk_buff *skb)
if (is_broadcast_ether_addr(dest)) {
if (IS_ENABLED(CONFIG_INET) &&
- p->flags & BR_PROXYARP &&
skb->protocol == htons(ETH_P_ARP))
br_do_proxy_arp(skb, br, vid);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists