diff options
| author |   Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-21 01:15:32 -0200 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:30:14 -0800 |
| commit | b1a98bf685e26f1a0b509d6f0f6bd8f7764303a5 (patch) | |
| tree | 8767ff864e85bf2748d74906c9805993c67c216c /net/core/neighbour.c | |
| parent | [ATM]: Use kmemdup & kzalloc where applicable (diff) | |
| download | linux-dev-b1a98bf685e26f1a0b509d6f0f6bd8f7764303a5.tar.xz linux-dev-b1a98bf685e26f1a0b509d6f0f6bd8f7764303a5.zip | |
[NET] neighbour: Use kmemdup where applicable
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to '')
| -rw-r--r-- | net/core/neighbour.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 0e097ba14d73..ba509a4a8e92 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1266,10 +1266,9 @@ void pneigh_enqueue(struct neigh_table *tbl, struct neigh_parms *p, struct neigh_parms *neigh_parms_alloc(struct net_device *dev, struct neigh_table *tbl) { - struct neigh_parms *p = kmalloc(sizeof(*p), GFP_KERNEL); + struct neigh_parms *p = kmemdup(&tbl->parms, sizeof(*p), GFP_KERNEL); if (p) { - memcpy(p, &tbl->parms, sizeof(*p)); p->tbl = tbl; atomic_set(&p->refcnt, 1); INIT_RCU_HEAD(&p->rcu_head); @@ -2625,14 +2624,14 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, int p_id, int pdev_id, char *p_name, proc_handler *handler, ctl_handler *strategy) { - struct neigh_sysctl_table *t = kmalloc(sizeof(*t), GFP_KERNEL); + struct neigh_sysctl_table *t = kmemdup(&neigh_sysctl_template, + sizeof(*t), GFP_KERNEL); const char *dev_name_source = NULL; char *dev_name = NULL; int err = 0; if (!t) return -ENOBUFS; - memcpy(t, &neigh_sysctl_template, sizeof(*t)); t->neigh_vars[0].data = &p->mcast_probes; t->neigh_vars[1].data = &p->ucast_probes; t->neigh_vars[2].data = &p->app_probes; |