aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-09 02:13:53 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-09 02:13:53 -0400
commitc773e847ea8f6812804e40f52399c6921a00eab1 (patch)
tree952e0e262cc0b0f2136bc2a62938ae1d186f896a /net/rose/af_rose.c
parenteb6aafe3f843cb0e939546c03540a3b4911b6964 (diff)
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/af_rose.c')
-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;
75 */ 75 */
76static struct lock_class_key rose_netdev_xmit_lock_key; 76static struct lock_class_key rose_netdev_xmit_lock_key;
77 77
78static void rose_set_lockdep_one(struct netdev_queue *txq)
79{
80 lockdep_set_class(&txq->_xmit_lock, &rose_netdev_xmit_lock_key);
81}
82
83static void rose_set_lockdep_key(struct net_device *dev)
84{
85 rose_set_lockdep_one(&dev->tx_queue);
86}
87
78/* 88/*
79 * Convert a ROSE address into text. 89 * Convert a ROSE address into text.
80 */ 90 */
@@ -1576,7 +1586,7 @@ static int __init rose_proto_init(void)
1576 free_netdev(dev); 1586 free_netdev(dev);
1577 goto fail; 1587 goto fail;
1578 } 1588 }
1579 lockdep_set_class(&dev->_xmit_lock, &rose_netdev_xmit_lock_key); 1589 rose_set_lockdep_key(dev);
1580 dev_rose[i] = dev; 1590 dev_rose[i] = dev;
1581 } 1591 }
1582 1592