Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0f7054e32fab251af5cab116da0ef6624a1a0c8b
Commit:     0f7054e32fab251af5cab116da0ef6624a1a0c8b
Parent:     61d30020dc2c49d36d95f3efb8b5ed727e459087
Author:     Ivo van Doorn <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 13 14:16:47 2008 +0100
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:10:08 2008 -0800

    mac80211: Initialize vif pointer
    
    Before calling update_beacon() mac80211 must
    initialize the control.vif pointer so it can
    be used by the driver to determine which
    interface is trying to send the beacon.
    
    v2: ieee80211_beacon_get() should also initialize the
    vif pointer since it can be called by mac80211 internally
    before calling config_interface().
    
    Signed-off-by: Ivo van Doorn <[EMAIL PROTECTED]>
    Acked-by: Johannes Berg <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 net/mac80211/ieee80211_sta.c |    1 +
 net/mac80211/tx.c            |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 866eb80..8b47d81 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2787,6 +2787,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
                               "for IBSS beacon\n", dev->name);
                        break;
                }
+               control.vif = &sdata->vif;
                control.tx_rate =
                        (sdata->bss_conf.use_short_preamble &&
                        (ratesel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f9088fe..67b509e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1752,6 +1752,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw 
*hw,
                        goto out;
                }
 
+               control->vif = vif;
                control->tx_rate =
                        (sdata->bss_conf.use_short_preamble &&
                        (rsel.rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
-
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