This makes lockdep aware of xmit_lock hierarchy between master and virtual
interfaces.
Signed-off-by: Jiri Benc <jbenc@xxxxxxx>
---
net/mac80211/ieee80211.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletion(-)
--- mac80211.orig/net/mac80211/ieee80211.c
+++ mac80211/net/mac80211/ieee80211.c
@@ -2167,6 +2167,16 @@ static int ieee80211_change_mtu_apdev(st
return 0;
}
+enum netif_tx_lock_class {
+ TX_LOCK_NORMAL,
+ TX_LOCK_MASTER,
+}
+
+static inline void netif_tx_lock_nested(struct net_device *dev, int subclass)
+{
+ spin_lock_nested(&dev->_xmit_lock, subclass);
+ dev->xmit_lock_owner = smp_processor_id();
+}
static void ieee80211_set_multicast_list(struct net_device *dev)
{
@@ -2174,7 +2184,7 @@ static void ieee80211_set_multicast_list
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
unsigned short flags;
- netif_tx_lock(local->mdev);
+ netif_tx_lock_nested(local->mdev, TX_LOCK_MASTER);
if (((dev->flags & IFF_ALLMULTI) != 0) ^ (sdata->allmulti != 0)) {
if (sdata->allmulti) {
sdata->allmulti = 0;
--
Jiri Benc
SUSE Labs
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
