diff options
| author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-06-20 10:01:32 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-19 21:13:24 -0700 |
| commit | cf89d6b2803ab99ac596f95d585c3057d2be645c (patch) | |
| tree | 7ec742e7250566bea08e6f06c31cb3d66fd1a794 /net/core | |
| parent | 75b2945988274078bccf4c0b84e90c77b4fcaf96 (diff) | |
| download | linux-stable-cf89d6b2803ab99ac596f95d585c3057d2be645c.tar.gz linux-stable-cf89d6b2803ab99ac596f95d585c3057d2be645c.tar.bz2 linux-stable-cf89d6b2803ab99ac596f95d585c3057d2be645c.zip | |
neigh: no need to call lookup_neigh_parms in neigh_parms_alloc
neigh_table.parms always exist and is initialized,kmemdup
can use it to create new neigh_parms, actually lookup_neigh_parms
here will return neigh_table.parms too.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index decaa4b9db2f..53eab513955a 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1429,15 +1429,11 @@ static inline struct neigh_parms *lookup_neigh_parms(struct neigh_table *tbl, struct neigh_parms *neigh_parms_alloc(struct net_device *dev, struct neigh_table *tbl) { - struct neigh_parms *p, *ref; + struct neigh_parms *p; struct net *net = dev_net(dev); const struct net_device_ops *ops = dev->netdev_ops; - ref = lookup_neigh_parms(tbl, net, 0); - if (!ref) - return NULL; - - p = kmemdup(ref, sizeof(*p), GFP_KERNEL); + p = kmemdup(&tbl->parms, sizeof(*p), GFP_KERNEL); if (p) { p->tbl = tbl; atomic_set(&p->refcnt, 1); |