summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-07-30 19:48:09 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-07-31 16:19:01 +0200
commit1411af156524ce42c2a7f989320c4484257f3ff5 (patch)
tree37d2c80eac53ee21bb019fd40e4ae3d959acf038 /net/mac80211
parentc405c6298eacd423098afacf6020ddbda1b0378b (diff)
downloadlinux-1411af156524ce42c2a7f989320c4484257f3ff5.tar.gz
linux-1411af156524ce42c2a7f989320c4484257f3ff5.tar.bz2
linux-1411af156524ce42c2a7f989320c4484257f3ff5.zip
mac80211: enable WDS carrier only after adding station
Enable the carrier on WDS type interfaces only after having added the station entry for the WDS peer so outgoing frames will find it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/iface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index c65a03ba809f..2d6ac78971ea 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -546,6 +546,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
case NL80211_IFTYPE_MESH_POINT:
netif_carrier_off(dev);
break;
+ case NL80211_IFTYPE_WDS:
+ break;
default:
netif_carrier_on(dev);
}
@@ -580,6 +582,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
}
rate_control_rate_init(sta);
+ netif_carrier_on(dev);
}
/*