mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 03:30:37 +02:00
mac80211: refresh patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34464 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
74b2b6e964
commit
a81af1e631
@ -106,10 +106,11 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* policy for the key attributes */
|
/* policy for the key attributes */
|
||||||
@@ -1604,6 +1605,22 @@ static int nl80211_set_wiphy(struct sk_b
|
@@ -1603,6 +1604,22 @@ static int nl80211_set_wiphy(struct sk_b
|
||||||
|
if (result)
|
||||||
goto bad_res;
|
goto bad_res;
|
||||||
}
|
}
|
||||||
|
+
|
||||||
+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
|
+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
|
||||||
+ int idx, dbi = 0;
|
+ int idx, dbi = 0;
|
||||||
+
|
+
|
||||||
@ -125,10 +126,9 @@
|
|||||||
+ if (result)
|
+ if (result)
|
||||||
+ goto bad_res;
|
+ goto bad_res;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
|
if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
|
||||||
info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
|
info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
|
||||||
u32 tx_ant, rx_ant;
|
|
||||||
--- a/net/mac80211/cfg.c
|
--- a/net/mac80211/cfg.c
|
||||||
+++ b/net/mac80211/cfg.c
|
+++ b/net/mac80211/cfg.c
|
||||||
@@ -1984,6 +1984,19 @@ static int ieee80211_get_tx_power(struct
|
@@ -1984,6 +1984,19 @@ static int ieee80211_get_tx_power(struct
|
||||||
|
@ -198,12 +198,12 @@
|
|||||||
- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
|
- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
|
||||||
-
|
-
|
||||||
- iounmap(base_addr);
|
- iounmap(base_addr);
|
||||||
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
|
-}
|
||||||
}
|
|
||||||
-#else
|
-#else
|
||||||
-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
|
-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
|
||||||
-{
|
-{
|
||||||
-}
|
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
|
||||||
|
}
|
||||||
-#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
|
-#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c
|
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
|
||||||
===================================================================
|
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
|
||||||
--- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
+++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
@@ -5072,6 +5072,27 @@ static const struct rf_channel rf_vals_3
|
@@ -5072,6 +5072,27 @@ static const struct rf_channel rf_vals_3
|
||||||
{173, 0x61, 0, 9},
|
{173, 0x61, 0, 9},
|
||||||
};
|
};
|
||||||
@ -87,10 +85,8 @@ Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c
|
|||||||
* Initialize hw specifications.
|
* Initialize hw specifications.
|
||||||
*/
|
*/
|
||||||
retval = rt2800_probe_hw_mode(rt2x00dev);
|
retval = rt2800_probe_hw_mode(rt2x00dev);
|
||||||
Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h
|
--- a/drivers/net/wireless/rt2x00/rt2x00.h
|
||||||
===================================================================
|
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
|
||||||
--- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2x00.h
|
|
||||||
+++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h
|
|
||||||
@@ -421,6 +421,7 @@ static inline struct rt2x00_intf* vif_to
|
@@ -421,6 +421,7 @@ static inline struct rt2x00_intf* vif_to
|
||||||
* @channels: Device/chipset specific channel values (See &struct rf_channel).
|
* @channels: Device/chipset specific channel values (See &struct rf_channel).
|
||||||
* @channels_info: Additional information for channels (See &struct channel_info).
|
* @channels_info: Additional information for channels (See &struct channel_info).
|
||||||
@ -107,10 +103,8 @@ Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h
|
|||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Index: compat-wireless-2012-09-07/include/linux/rt2x00_platform.h
|
--- a/include/linux/rt2x00_platform.h
|
||||||
===================================================================
|
+++ b/include/linux/rt2x00_platform.h
|
||||||
--- compat-wireless-2012-09-07.orig/include/linux/rt2x00_platform.h
|
|
||||||
+++ compat-wireless-2012-09-07/include/linux/rt2x00_platform.h
|
|
||||||
@@ -18,6 +18,7 @@ struct rt2x00_platform_data {
|
@@ -18,6 +18,7 @@ struct rt2x00_platform_data {
|
||||||
|
|
||||||
int disable_2ghz;
|
int disable_2ghz;
|
||||||
|
Loading…
Reference in New Issue
Block a user