From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jouni Malinen Subject: [PATCH v2 1/3] bridge: Base the BR_PROXYARP decision on the target port flag Date: Thu, 5 Feb 2015 11:54:21 +0200 Message-ID: <1423130063-18323-1-git-send-email-jouni@codeaurora.org> Cc: netdev@vger.kernel.org, Kyeyoon Park , Jouni Malinen To: David Miller Return-path: Received: from smtp.codeaurora.org ([198.145.11.231]:54260 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753157AbbBEJy6 (ORCPT ); Thu, 5 Feb 2015 04:54:58 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: Kyeyoon Park 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 Signed-off-by: Jouni Malinen --- 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