From 37e8edbd2418a69bb6a1698dfb3a169bc62dbcb7 Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Tue, 10 Jul 2012 21:22:42 +0000 Subject: [PATCH] --- yaml --- r: 315143 b: refs/heads/master c: 4d27de149ba17eb7643b6665ad3513d00d65b6c2 h: refs/heads/master i: 315141: 8703ffe073e2dc19b77f9dd7b8282f1184ce705a 315139: 78b0bbabd24cd2cdaaf9a7df3a6fad8e6ad7c60f 315135: 58b06f4337562b8c5389a43beb6387878f579e88 v: v3 --- [refs] | 2 +- trunk/net/ieee802154/6lowpan.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3babec7fb0be..a57cd638d4ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d348446b8840602091872b8272855dee196f6dd5 +refs/heads/master: 4d27de149ba17eb7643b6665ad3513d00d65b6c2 diff --git a/trunk/net/ieee802154/6lowpan.c b/trunk/net/ieee802154/6lowpan.c index f4070e54d1a1..b872515f2137 100644 --- a/trunk/net/ieee802154/6lowpan.c +++ b/trunk/net/ieee802154/6lowpan.c @@ -123,7 +123,7 @@ struct lowpan_fragment { static unsigned short fragment_tag; static LIST_HEAD(lowpan_fragments); -spinlock_t flist_lock; +static DEFINE_SPINLOCK(flist_lock); static inline struct lowpan_dev_info *lowpan_dev_info(const struct net_device *dev) @@ -1186,8 +1186,6 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev, list_add_tail(&entry->list, &lowpan_devices); mutex_unlock(&lowpan_dev_info(dev)->dev_list_mtx); - spin_lock_init(&flist_lock); - register_netdevice(dev); return 0;