diff options
author | Eliad Peller <eliad@wizery.com> | 2011-11-08 17:36:59 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 21:32:49 +0400 |
commit | 86a2ea4134b48f6371103cfceb521bf2d2bf76cd (patch) | |
tree | 3a8477f9b078b8dd69bba51be49fa62b48195b5f /net/mac80211/iface.c | |
parent | 94e2ad9ee47025747d19620f288fb533d49c0475 (diff) | |
download | linux-86a2ea4134b48f6371103cfceb521bf2d2bf76cd.tar.xz |
mac80211: set carrier_on for ibss vifs only while joined
mac80211 should set carrier_on for ibss vifs
only while they are joined (similar to sta vifs)
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index b7bc4b7b80af..7b0c25bf8bbf 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -293,7 +293,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) changed |= ieee80211_reset_erp_info(sdata); ieee80211_bss_info_change_notify(sdata, changed); - if (sdata->vif.type == NL80211_IFTYPE_STATION) + if (sdata->vif.type == NL80211_IFTYPE_STATION || + sdata->vif.type == NL80211_IFTYPE_ADHOC) netif_carrier_off(dev); else netif_carrier_on(dev); |