From patchwork Mon Jul 9 10:22:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 169746 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B04C52C096A for ; Mon, 9 Jul 2012 20:26:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753009Ab2GIK0i (ORCPT ); Mon, 9 Jul 2012 06:26:38 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:33420 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752998Ab2GIK0g (ORCPT ); Mon, 9 Jul 2012 06:26:36 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so5787740bkw.19 for ; Mon, 09 Jul 2012 03:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=z8tyYZKNNcC6Xfd9ig8ZbPqUDfGC7cCLLP0NsnPvm5Y=; b=Fcf73/jULku6e2cv/HD56Vyly2E4M5jxyAQazOQCD5iDqcuH03itdNAH+abqopm1s4 oQLWaJFbp8e+vuBJlbfr9vc4TCHLi4QkS2tGoedwtasBC1lPyvVUNpogRFMDN2gughw6 6Mmvi4E4NLGIzMq28iBbQwCPHNhqT28mq53DuvLlpyeP1ng8TRzdGH76hmBhyEb9T+Z3 NJ36evLprkwGAhiiK7eBmkILj0aFmyeIqdD2CRmCuEkTYv2rcqmp1ujASRWSj4ShlMem DqLd9wo5PYgUGI2nIoJNqASPNUg0tESJx4W0Dnv7ZaML/SEm0pra0ARyfqvvf3gFEP9y GLbQ== Received: by 10.204.129.27 with SMTP id m27mr1241553bks.115.1341829595818; Mon, 09 Jul 2012 03:26:35 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id g6sm2416025bkg.2.2012.07.09.03.26.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 03:26:35 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net, eric.dumazet@gmail.com Cc: netdev@vger.kernel.org, Alexander Smirnov Subject: [PATCH net-next 1/6] 6lowpan: revert: add missing spin_lock_init() Date: Mon, 9 Jul 2012 14:22:26 +0400 Message-Id: <1341829351-18485-2-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1341829351-18485-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1341829351-18485-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Revert the commit 768f7c7c121e80f458a9d013b2e8b169e5dfb1e5 to initialize spinlock in the more preferable way and make it static to avoid sparse warning. Signed-off-by: Alexander Smirnov --- net/ieee802154/6lowpan.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index f4070e5..b872515 100644 --- a/net/ieee802154/6lowpan.c +++ b/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;