diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
| commit | 4e5a5112cc603d1dcfe7247723e1c08b8ffbc7ff (patch) | |
| tree | 0eafc6ed77e008065ece3acd9ea83cc1a19a4122 /net/ipv4/arp.c | |
| parent | 05eda3c7aedbe06e9692a4a1ca511c6ab3d72de5 (diff) | |
| parent | 90aaf2f25609f99b63fcbed280716f80b4bc5f56 (diff) | |
Merge tag 'v3.18.93' into linux-linaro-lsk-v3.18lsk-v3.18-18.02
This is the 3.18.93 stable release
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 16acb59d665e..263729dea532 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -221,11 +221,16 @@ static u32 arp_hash(const void *pkey, static int arp_constructor(struct neighbour *neigh) { - __be32 addr = *(__be32 *)neigh->primary_key; + __be32 addr; struct net_device *dev = neigh->dev; struct in_device *in_dev; struct neigh_parms *parms; + u32 inaddr_any = INADDR_ANY; + if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) + memcpy(neigh->primary_key, &inaddr_any, arp_tbl.key_len); + + addr = *(__be32 *)neigh->primary_key; rcu_read_lock(); in_dev = __in_dev_get_rcu(dev); if (in_dev == NULL) { |