summaryrefslogtreecommitdiff
path: root/net/rose
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-09 10:13:53 +0400
committerDavid S. Miller <davem@davemloft.net>2008-07-09 10:13:53 +0400
commitc773e847ea8f6812804e40f52399c6921a00eab1 (patch)
tree952e0e262cc0b0f2136bc2a62938ae1d186f896a /net/rose
parenteb6aafe3f843cb0e939546c03540a3b4911b6964 (diff)
downloadlinux-c773e847ea8f6812804e40f52399c6921a00eab1.tar.xz
netdev: Move _xmit_lock and xmit_lock_owner into netdev_queue.
Accesses are mostly structured such that when there are multiple TX queues the code transformations will be a little bit simpler. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose')
-rw-r--r--net/rose/af_rose.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 46461a69cd0f..7dbbc0891623 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -75,6 +75,16 @@ ax25_address rose_callsign;
*/
static struct lock_class_key rose_netdev_xmit_lock_key;
+static void rose_set_lockdep_one(struct netdev_queue *txq)
+{
+ lockdep_set_class(&txq->_xmit_lock, &rose_netdev_xmit_lock_key);
+}
+
+static void rose_set_lockdep_key(struct net_device *dev)
+{
+ rose_set_lockdep_one(&dev->tx_queue);
+}
+
/*
* Convert a ROSE address into text.
*/
@@ -1576,7 +1586,7 @@ static int __init rose_proto_init(void)
free_netdev(dev);
goto fail;
}
- lockdep_set_class(&dev->_xmit_lock, &rose_netdev_xmit_lock_key);
+ rose_set_lockdep_key(dev);
dev_rose[i] = dev;
}