KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: merge upstream fixes

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39442
This commit is contained in:
Felix Fietkau 2014-02-01 15:33:04 +00:00
parent 8fa06b7e3c
commit b9a605b8bf
4 changed files with 881 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

893
package/kernel/mac80211/patches/300-pending_work.patch
View file

File diff suppressed because it is too large Load diff

2
package/kernel/mac80211/patches/310-ap_scan.patch
View file

@ -1,6 +1,6 @@
--- a/net/mac80211/cfg.c --- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c
@@ -2142,7 +2142,7 @@ static int ieee80211_scan(struct wiphy * @@ -2145,7 +2145,7 @@ static int ieee80211_scan(struct wiphy *
* the frames sent while scanning on other channel will be * the frames sent while scanning on other channel will be
* lost) * lost)
*/ */

2
package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
View file

@ -10,7 +10,7 @@
u8 uapsd_queues; u8 uapsd_queues;
--- a/net/mac80211/cfg.c --- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c
@@ -2323,7 +2323,9 @@ static int ieee80211_get_tx_power(struct @@ -2326,7 +2326,9 @@ static int ieee80211_get_tx_power(struct
struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

4
package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
View file

@ -57,7 +57,7 @@
__NL80211_ATTR_AFTER_LAST, __NL80211_ATTR_AFTER_LAST,
--- a/net/mac80211/cfg.c --- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c
@@ -2333,6 +2333,19 @@ static int ieee80211_get_tx_power(struct @@ -2336,6 +2336,19 @@ static int ieee80211_get_tx_power(struct
return 0; return 0;
} }
@ -77,7 +77,7 @@
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
const u8 *addr) const u8 *addr)
{ {
@@ -3916,6 +3929,7 @@ struct cfg80211_ops mac80211_config_ops @@ -3921,6 +3934,7 @@ struct cfg80211_ops mac80211_config_ops
.set_wiphy_params = ieee80211_set_wiphy_params, .set_wiphy_params = ieee80211_set_wiphy_params,
.set_tx_power = ieee80211_set_tx_power, .set_tx_power = ieee80211_set_tx_power,
.get_tx_power = ieee80211_get_tx_power, .get_tx_power = ieee80211_get_tx_power,