Changeset 32684


Ignore:
Timestamp:
2012-07-12T16:14:57+02:00 (6 years ago)
Author:
nbd
Message:

mac80211: fix an ap + sta mode regression that prevented the sta from connecting (#11847)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/300-pending_work.patch

    r32655 r32684  
    19851985        skb_set_mac_header(skb, 0); 
    19861986        skb_set_network_header(skb, 0); 
     1987--- a/net/wireless/chan.c 
     1988+++ b/net/wireless/chan.c 
     1989@@ -136,9 +136,16 @@ cfg80211_get_chan_state(struct cfg80211_ 
     1990                break; 
     1991        case NL80211_IFTYPE_AP: 
     1992        case NL80211_IFTYPE_P2P_GO: 
     1993+               if (wdev->beacon_interval) { 
     1994+                       *chan = wdev->channel; 
     1995+                       *chanmode = CHAN_MODE_SHARED; 
     1996+               } 
     1997+               return; 
     1998        case NL80211_IFTYPE_MESH_POINT: 
     1999-               *chan = wdev->channel; 
     2000-               *chanmode = CHAN_MODE_SHARED; 
     2001+               if (wdev->mesh_id_len) { 
     2002+                       *chan = wdev->channel; 
     2003+                       *chanmode = CHAN_MODE_SHARED; 
     2004+               } 
     2005                return; 
     2006        case NL80211_IFTYPE_MONITOR: 
     2007        case NL80211_IFTYPE_AP_VLAN: 
Note: See TracChangeset for help on using the changeset viewer.