summaryrefslogtreecommitdiffstats
path: root/net/ipv4/arp.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-03-02 00:13:22 -0600
committerDavid S. Miller <davem@davemloft.net>2015-03-02 16:43:41 -0500
commitbdf53c58490bb52e17636eca8ad18d2c38ec3cb8 (patch)
tree01c3bae0fbaca8d1ba308d527ac2b1900ffb3b13 /net/ipv4/arp.c
parent59b2af26b9f674749216fd3bfba19d842de3671c (diff)
downloadlinux-bdf53c58490bb52e17636eca8ad18d2c38ec3cb8.tar.bz2
neigh: Don't require dst in neigh_hh_init
- Add protocol to neigh_tbl so that dst->ops->protocol is not needed - Acquire the device from neigh->dev This results in a neigh_hh_init that will cache the samve values regardless of the packets flowing through it. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r--net/ipv4/arp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index bca5b9d9b442..6b8aad6a0d7d 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -152,6 +152,7 @@ static const struct neigh_ops arp_direct_ops = {
struct neigh_table arp_tbl = {
.family = AF_INET,
.key_len = 4,
+ .protocol = cpu_to_be16(ETH_P_IP),
.hash = arp_hash,
.constructor = arp_constructor,
.proxy_redo = parp_redo,