From 871e8d0cea22634e7195cdc7821c520d928dc7f4 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 19 Jun 2012 15:54:05 +0200 Subject: [PATCH] --- yaml --- r: 314877 b: refs/heads/master c: 371a255e863857f988a91a3850d6feeaa4f3c536 h: refs/heads/master i: 314875: 84295b6eb6e38e79d035ec1c681b31c319607a7b v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0352cb6cbbb8..100e440d00fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 171243612f1612402fbf83f3f034a1beefcdea61 +refs/heads/master: 371a255e863857f988a91a3850d6feeaa4f3c536 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 576880317d0e..58c2ab3d483a 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -97,15 +97,12 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata, { struct ieee80211_local *local = sdata->local; struct ieee80211_sub_if_data *nsdata; - struct net_device *dev = sdata->dev; ASSERT_RTNL(); /* we hold the RTNL here so can safely walk the list */ list_for_each_entry(nsdata, &local->interfaces, list) { - struct net_device *ndev = nsdata->dev; - - if (ndev != dev && ieee80211_sdata_running(nsdata)) { + if (nsdata != sdata && ieee80211_sdata_running(nsdata)) { /* * Allow only a single IBSS interface to be up at any * time. This is restricted because beacon distribution @@ -124,7 +121,8 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata, * The remaining checks are only performed for interfaces * with the same MAC address. */ - if (!ether_addr_equal(dev->dev_addr, ndev->dev_addr)) + if (!ether_addr_equal(sdata->vif.addr, + nsdata->vif.addr)) continue; /*