Skip to contentSkip to conversation

bridge: make proxy arp configurable

PATCH In review Stephen Hemminger 3 participants 4 messages Oct 31, 2014 – Nov 21, 2014

Subsystems (3)
Networking Network drivers Ethernet bridge
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

PATCH 1/1 bridge: make proxy arp configurable

This solves kernel build without INET enabled, and allows user to control building this feature.

Signed-off-by Stephen Hemminger <[email protected]>
---
 net/bridge/Kconfig       |   16 ++++++++++++++++
 net/bridge/br_input.c    |    4 ++++
 net/bridge/br_sysfs_if.c |    4 ++++
 3 files changed, 24 insertions(+)
net/bridge/Kconfig +16 -0
@@ -60,3 +60,19 @@ config BRIDGE_VLAN_FILTERING
 	  Say N to exclude this support and reduce the binary size.
 
 	  If unsure, say Y.
+
+config BRIDGE_ARP_PROXY
+	bool "ARP proxying"
+	depends on BRIDGE
+	depends on INET
+	default y
+	---help---
+	  If you say Y here, then the Ethernet bridge to keep track of
+	  the hardware address to IP address mapping.
+
+	  It is most useful when used as a wireless AP.
+
+	  Say N to exclude this support and reduce the binary size.
+
+	  If unsure, say Y.
+
net/bridge/br_input.c +4 -0
@@ -59,6 +59,7 @@ static int br_pass_frame_up(struct sk_bu
 		       netif_receive_skb);
 }
 
+#ifdef CONFIG_BRIDGE_PROXY_ARP
 static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br,
 			    u16 vid)
 {

@@ -112,6 +113,7 @@ static void br_do_proxy_arp(struct sk_bu
 		neigh_release(n);
 	}
 }
+#endif
 
 /* note: already called with rcu_read_lock */
 int br_handle_frame_finish(struct sk_buff *skb)

@@ -154,9 +156,11 @@ int br_handle_frame_finish(struct sk_buf
 	dst = NULL;
 
 	if (is_broadcast_ether_addr(dest)) {
+#ifdef CONFIG_BRIDGE_PROXY_ARP
 		if (p->flags & BR_PROXYARP &&
 		    skb->protocol == htons(ETH_P_ARP))
 			br_do_proxy_arp(skb, br, vid);
+#endif
 
 		skb2 = skb;
 		unicast = false;
net/bridge/br_sysfs_if.c +4 -0
@@ -170,7 +170,9 @@ BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUA
 BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);
 BRPORT_ATTR_FLAG(learning, BR_LEARNING);
 BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD);
+#ifdef CONFIG_BRIDGE_PROXY_ARP
 BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
+#endif
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
 static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)

@@ -214,7 +216,9 @@ static const struct brport_attribute *br
 	&brport_attr_multicast_router,
 	&brport_attr_multicast_fast_leave,
 #endif
+#ifdef CONFIG_BRIDGE_PROXY_ARP
 	&brport_attr_proxyarp,
+#endif
 	NULL
 };
maintainer
#1 lore raw

From: Stephen Hemminger <[email protected]>
Date: Thu, 30 Oct 2014 20:09:42 -0700

Quoted 10 lines
net/bridge/Kconfig +6 -0
@@ -60,3 +60,19 @@ config BRIDGE_VLAN_FILTERING
 	  Say N to exclude this support and reduce the binary size.
 
 	  If unsure, say Y.
+
+config BRIDGE_ARP_PROXY
+	bool "ARP proxying"
+	depends on BRIDGE
+	depends on INET
+	default y

net/bridge/Kconfig config BRIDGE_VLAN_FILTERING · line 78

Quoted 10 lines
net/bridge/Kconfig +10 -0
+	---help---
+	  If you say Y here, then the Ethernet bridge to keep track of
+	  the hardware address to IP address mapping.
+
+	  It is most useful when used as a wireless AP.
+
+	  Say N to exclude this support and reduce the binary size.
+
+	  If unsure, say Y.
+

Please do not ever add empty lines at the end of files, GIT warns about this when I try to apply your patch.

#2 lore raw
Quoted 18 lines

From: Stephen Hemminger <[email protected]>
Date: Thu, 30 Oct 2014 20:09:42 -0700

Quoted 15 lines
net/bridge/Kconfig +11 -0
@@ -60,3 +60,19 @@ config BRIDGE_VLAN_FILTERING
 	  Say N to exclude this support and reduce the binary size.
 
 	  If unsure, say Y.
+
+config BRIDGE_ARP_PROXY
+	bool "ARP proxying"
+	depends on BRIDGE
+	depends on INET
+	default y
+	---help---
+	  If you say Y here, then the Ethernet bridge to keep track of
+	  the hardware address to IP address mapping.
+
+	  It is most useful when used as a wireless AP.
Quoted 8 lines

net/bridge/Kconfig config BRIDGE_VLAN_FILTERING · line 78

Quoted 5 lines
net/bridge/Kconfig +5 -0
+
+	  Say N to exclude this support and reduce the binary size.
+
+	  If unsure, say Y.
+

Please do not ever add empty lines at the end of files, GIT warns about this when I try to apply your patch.

Hi Dave, I notice that this patch was never applied to "net-next". I have one more patch contribution to make to the bridge code regarding Proxy ARP IPv4. I would very much like this patch by Stephen to be applied as well. I have no problem resubmitting this patch (with the empty line removed). Do you want me to do that as part of the set?

Thanks!

- Kyeyoon

maintainer
#3 lore raw

From: [email protected]
Date: Wed, 19 Nov 2014 23:11:52 -0000

Quoted 4 lines
Quoted 2 lines

Please do not ever add empty lines at the end of files, GIT warns about this when I try to apply your patch.

Hi Dave, I notice that this patch was never applied to "net-next".

I didn't apply it because it needs changes.

Please always look into patchwork to see what the state of a patch is, if you had looked, you would have seen that I marked the patch as "changed requested", which clearly states what the situation is.

Thanks.