1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[backfire] backport mac80211 updates from trunk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21803 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2010-06-14 18:35:47 +00:00
parent f210f1fdc9
commit e775c43c07
26 changed files with 1982 additions and 10272 deletions

View File

@@ -8,7 +8,7 @@
#include "ath9k.h"
static char *dev_info = "ath9k";
@@ -580,6 +581,8 @@ static int ath9k_init_softc(u16 devid, s
@@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s
pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
if (!pdata)
ah->ah_flags |= AH_USE_EEPROM;
@@ -17,7 +17,7 @@
common = ath9k_hw_common(ah);
common->ops = &ath9k_common_ops;
@@ -702,6 +705,24 @@ void ath9k_set_hw_capab(struct ath_softc
@@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
}
@@ -42,7 +42,7 @@
int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
const struct ath_bus_ops *bus_ops)
{
@@ -720,6 +741,9 @@ int ath9k_init_device(u16 devid, struct
@@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct
common = ath9k_hw_common(ah);
ath9k_set_hw_capab(sc, hw);
@@ -54,7 +54,7 @@
ath9k_reg_notifier);
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -517,6 +517,8 @@ struct ath_softc {
@@ -583,6 +583,8 @@ struct ath_softc {
int beacon_interval;