From 65e6d64a773e54dae591d8a6df8ec50e4da6de31 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 25 Jan 2007 15:51:51 -0800 Subject: [PATCH] --- yaml --- r: 45875 b: refs/heads/master c: 95743deb34de29defbb98ad477700aaf344f93f3 h: refs/heads/master i: 45873: ce84ca53c1e65d52d720e042036704b39b4b12d9 45871: e2996cc7c1815c9edd10f30d815853128c61fa72 v: v3 --- [refs] | 2 +- trunk/net/decnet/dn_dev.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b9be0323911..2f1c2a930176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24cb230b587cf3aad8794b150682d8d8303a2120 +refs/heads/master: 95743deb34de29defbb98ad477700aaf344f93f3 diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c index fc6f3c023a54..ed083ab455b7 100644 --- a/trunk/net/decnet/dn_dev.c +++ b/trunk/net/decnet/dn_dev.c @@ -1145,16 +1145,23 @@ struct dn_dev *dn_dev_create(struct net_device *dev, int *err) init_timer(&dn_db->timer); dn_db->uptime = jiffies; + + dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table); + if (!dn_db->neigh_parms) { + dev->dn_ptr = NULL; + kfree(dn_db); + return NULL; + } + if (dn_db->parms.up) { if (dn_db->parms.up(dev) < 0) { + neigh_parms_release(&dn_neigh_table, dn_db->neigh_parms); dev->dn_ptr = NULL; kfree(dn_db); return NULL; } } - dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table); - dn_dev_sysctl_register(dev, &dn_db->parms); dn_dev_set_timer(dev);