Changeset 40296


Ignore:
Timestamp:
2014-03-28T17:05:46+01:00 (4 years ago)
Author:
jow
Message:

mac80211: skip antenna gain when compiling regdb.txt (#15397)

The antenna gain attribute has been removed from the upstream regulatory database.
Incorperate patch from Luis R. Rodriguez to skip the parsing of the gain attribute
in genregdb.awk in order to emit proper rules again.

Also refresh fuzzy patches while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@…>

Location:
trunk/package/kernel/mac80211/patches
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch

    r39846 r40296  
    7878                                  const u8 *addr) 
    7979 { 
    80 @@ -3924,6 +3937,7 @@ struct cfg80211_ops mac80211_config_ops  
     80@@ -3924,6 +3937,7 @@ struct cfg80211_ops mac80211_config_ops 
    8181        .set_wiphy_params = ieee80211_set_wiphy_params, 
    8282        .set_tx_power = ieee80211_set_tx_power, 
     
    148148  
    149149 /* policy for the key attributes */ 
    150 @@ -2105,6 +2106,22 @@ static int nl80211_set_wiphy(struct sk_b 
     150@@ -2104,6 +2105,22 @@ static int nl80211_set_wiphy(struct sk_b 
     151                if (result) 
    151152                        goto bad_res; 
    152153        } 
    153   
     154+ 
    154155+       if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { 
    155156+               int idx, dbi = 0; 
     
    167168+                       goto bad_res; 
    168169+       } 
    169 + 
     170  
    170171        if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && 
    171172            info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) { 
    172                 u32 tx_ant, rx_ant; 
  • trunk/package/kernel/mac80211/patches/920-wlcore-don-t-switch-channels-on-disconnected-STA-vif.patch

    r39947 r40296  
    1212 1 file changed, 7 insertions(+) 
    1313 
    14 diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c 
    15 index 117e01e..a0c5a1e 100644 
    1614--- a/drivers/net/wireless/ti/wlcore/main.c 
    1715+++ b/drivers/net/wireless/ti/wlcore/main.c 
    18 @@ -5224,6 +5224,10 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
     16@@ -5179,6 +5179,10 @@ static void wl12xx_op_channel_switch(str 
    1917        if (unlikely(wl->state == WLCORE_STATE_OFF)) { 
    2018                wl12xx_for_each_wlvif_sta(wl, wlvif) { 
     
    2725                } 
    2826                goto out; 
    29 @@ -5239,6 +5243,9 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
     27@@ -5194,6 +5198,9 @@ static void wl12xx_op_channel_switch(str 
    3028        wl12xx_for_each_wlvif_sta(wl, wlvif) { 
    3129                unsigned long delay_usec; 
     
    3735                if (ret) 
    3836                        goto out_sleep; 
    39 --  
    40 1.8.3.2 
    41  
Note: See TracChangeset for help on using the changeset viewer.