diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-06-09 10:45:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-09 16:28:37 -0400 |
| commit | d3fff6c443fe8f8a5ef2bdcea45e2ff39db948c7 (patch) | |
| tree | ec632344dab9ba6c7a3767aa4054e682ddf5871c /net/l2tp | |
| parent | 52fbb2907988aa0583c6d9d53a56aee090b2df7e (diff) | |
net: add netdev_lockdep_set_classes() helper
It is time to add netdev_lockdep_set_classes() helper
so that lockdep annotations per device type are easier to manage.
This removes a lot of copies and missing annotations.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index c00d72d182fa..57fc5a46ce06 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c | |||
| @@ -67,9 +67,6 @@ static inline struct l2tp_eth_net *l2tp_eth_pernet(struct net *net) | |||
| 67 | return net_generic(net, l2tp_eth_net_id); | 67 | return net_generic(net, l2tp_eth_net_id); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static struct lock_class_key l2tp_eth_tx_busylock; | ||
| 71 | static struct lock_class_key l2tp_qdisc_running_key; | ||
| 72 | |||
| 73 | static int l2tp_eth_dev_init(struct net_device *dev) | 70 | static int l2tp_eth_dev_init(struct net_device *dev) |
| 74 | { | 71 | { |
| 75 | struct l2tp_eth *priv = netdev_priv(dev); | 72 | struct l2tp_eth *priv = netdev_priv(dev); |
| @@ -77,8 +74,7 @@ static int l2tp_eth_dev_init(struct net_device *dev) | |||
| 77 | priv->dev = dev; | 74 | priv->dev = dev; |
| 78 | eth_hw_addr_random(dev); | 75 | eth_hw_addr_random(dev); |
| 79 | eth_broadcast_addr(dev->broadcast); | 76 | eth_broadcast_addr(dev->broadcast); |
| 80 | dev->qdisc_tx_busylock = &l2tp_eth_tx_busylock; | 77 | netdev_lockdep_set_classes(dev); |
| 81 | dev->qdisc_running_key = &l2tp_qdisc_running_key; | ||
| 82 | 78 | ||
| 83 | return 0; | 79 | return 0; |
| 84 | } | 80 | } |
