diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-01-13 15:10:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-14 21:08:02 +0100 |
| commit | d92cfdbbeaefb467de4fac98679fa6c33461d250 (patch) | |
| tree | be3ab86689fe9ac2b2d714038c01e05dbb463a3f | |
| parent | neighbour: fix base_reachable_time(_ms) not effective immediatly when changed (diff) | |
| download | linux-d92cfdbbeaefb467de4fac98679fa6c33461d250.tar.xz linux-d92cfdbbeaefb467de4fac98679fa6c33461d250.zip | |
bridge: only provide proxy ARP when CONFIG_INET is enabled
When IPV4 support is disabled, we cannot call arp_send from
the bridge code, which would result in a kernel link error:
net/built-in.o: In function `br_handle_frame_finish':
:(.text+0x59914): undefined reference to `arp_send'
:(.text+0x59a50): undefined reference to `arp_tbl'
This makes the newly added proxy ARP support in the bridge
code depend on the CONFIG_INET symbol and lets the compiler
optimize the code out to avoid the link error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
Cc: Kyeyoon Park <kyeyoonp@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 1f1de715197c..e2aa7be3a847 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -154,7 +154,8 @@ int br_handle_frame_finish(struct sk_buff *skb) dst = NULL; if (is_broadcast_ether_addr(dest)) { - if (p->flags & BR_PROXYARP && + if (IS_ENABLED(CONFIG_INET) && + p->flags & BR_PROXYARP && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid); |