diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-07-27 15:43:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 01:47:41 +0200 |
| commit | 1bec3f1a3ec5d922d1040c7845b82cd496c02d90 (patch) | |
| tree | 59707c55193c4b61ec4a5d14d704d4d3e767d872 /net/mac80211/ieee80211.c | |
| parent | [MAC80211]: Improve sanity checks on injected packets (diff) | |
| download | linux-1bec3f1a3ec5d922d1040c7845b82cd496c02d90.tar.xz linux-1bec3f1a3ec5d922d1040c7845b82cd496c02d90.zip | |
[MAC80211]: fix add_interface monitor mode behaviour
This makes it behave the same whether we have monitor during operation
or not.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211.c')
| -rw-r--r-- | net/mac80211/ieee80211.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 4715a9525918..5fc240259f55 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -425,7 +425,10 @@ static int ieee80211_open(struct net_device *dev) conf.if_id = dev->ifindex; 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); if (res) { if (sdata->type == IEEE80211_IF_TYPE_MNTR) |