Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1bec3f1a3ec5d922d1040c7845b82cd496c02d90
Commit:     1bec3f1a3ec5d922d1040c7845b82cd496c02d90
Parent:     9b8a74e3482f9fc077a88c13fa0ceca8feb0b772
Author:     Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 27 15:43:24 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:47:41 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 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 4715a95..5fc2402 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to