Commit 1bec3f1a authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

[MAC80211]: fix add_interface monitor mode behaviour

This makes it behave the same whether we have monitor during operation
or not.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9b8a74e3
...@@ -425,7 +425,10 @@ static int ieee80211_open(struct net_device *dev) ...@@ -425,7 +425,10 @@ static int ieee80211_open(struct net_device *dev)
conf.if_id = dev->ifindex; conf.if_id = dev->ifindex;
conf.type = sdata->type; conf.type = sdata->type;
conf.mac_addr = dev->dev_addr; if (sdata->type == IEEE80211_IF_TYPE_MNTR)
conf.mac_addr = NULL;
else
conf.mac_addr = dev->dev_addr;
res = local->ops->add_interface(local_to_hw(local), &conf); res = local->ops->add_interface(local_to_hw(local), &conf);
if (res) { if (res) {
if (sdata->type == IEEE80211_IF_TYPE_MNTR) if (sdata->type == IEEE80211_IF_TYPE_MNTR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment