From patchwork Sun Aug 19 07:29:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 2269 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id CC80F600891 for ; Sun, 19 Aug 2012 09:30:03 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass reason="1024-bit key; insecure key" header.i=@narfation.org header.b=QgiedlKM; dkim-adsp=pass; dkim-atps=neutral Received: from sven-desktop.home.narfation.org (unknown [78.134.85.115]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 20E8394062; Sun, 19 Aug 2012 09:30:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=20121; t=1345361403; bh=WrEYYYhxYOzKLVsz+OxAwO4OS8Kua1Yg6MH2iaX3reU=; h=From:To:Cc:Subject:Date:From; b=QgiedlKM7VGqDfUJdDG1qJmMrMR1TbK+sC/D8m+LsSDbUoXVHewqvSJxjIsrPsLRz xK/Cx9aMxhsDR+ChCZqkMUHiiSDav4TuMK1m02kDNpW0UU3epDWxPlH5w06CBAHcRi OJCaOLTI/j4Rl22+sP+4J1TxYw8uxfl2MCe3xaV8= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Aug 2012 09:29:53 +0200 Message-Id: <1345361393-8759-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [RFC] batman-adv: Set special lockdep classes to avoid lockdep warning X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Aug 2012 07:30:04 -0000 [text will be added after I am awake... maybe] [Should be fix the problem found in bug 162... formerly known as 161. code stolen from macvlan... this is just a reimplementation of a solution proposed by Simon Wunderlich] Reported-by: Linus Lüssing Signed-off-by: Sven Eckelmann Acked-by: Simon Wunderlich --- soft-interface.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 1aee7db..588c6f6 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -344,7 +344,36 @@ out: return; } +/* + * batman-adv network devices have devices nesting below it and are a special + * "super class" of normal network devices; split their locks off into a + * separate class since they always nest. + */ +static struct lock_class_key batadv_netdev_xmit_lock_key; +static struct lock_class_key batadv_netdev_addr_lock_key; + +static void batadv_set_lockdep_class_one(struct net_device *dev, + struct netdev_queue *txq, + void *_unused) +{ + lockdep_set_class(&txq->_xmit_lock, &batadv_netdev_xmit_lock_key); +} + +static void batadv_set_lockdep_class(struct net_device *dev) +{ + lockdep_set_class(&dev->addr_list_lock, &batadv_netdev_addr_lock_key); + netdev_for_each_tx_queue(dev, batadv_set_lockdep_class_one, NULL); +} + +static int batadv_softif_init(struct net_device *dev) +{ + batadv_set_lockdep_class(dev); + + return 0; +} + static const struct net_device_ops batadv_netdev_ops = { + .ndo_init = batadv_softif_init, .ndo_open = batadv_interface_open, .ndo_stop = batadv_interface_release, .ndo_get_stats = batadv_interface_stats,