PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse Source
This commit is contained in:
David S. Miller 2010-01-28 05:42:33 -08:00
commit 744595c847
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -855,12 +855,11 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah)
} }
} }
static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah) static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah)
{ {
u32 i, j; u32 i, j;
if ((ah->hw_version.devid == AR9280_DEVID_PCI) && if (ah->hw_version.devid == AR9280_DEVID_PCI) {
test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) {
/* EEPROM Fixup */ /* EEPROM Fixup */
for (i = 0; i < ah->iniModes.ia_rows; i++) { for (i = 0; i < ah->iniModes.ia_rows; i++) {
@ -980,7 +979,7 @@ int ath9k_hw_init(struct ath_hw *ah)
if (r) if (r)
return r; return r;
ath9k_hw_init_11a_eeprom_fix(ah); ath9k_hw_init_eeprom_fix(ah);
r = ath9k_hw_init_macaddr(ah); r = ath9k_hw_init_macaddr(ah);
if (r) { if (r) {

2
drivers/net/wireless/ath/ath9k/main.c
View File

@ -2655,10 +2655,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
(sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
ath_beacon_return(sc, avp);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
} }
ath_beacon_return(sc, avp);
sc->sc_flags &= ~SC_OP_BEACONS; sc->sc_flags &= ~SC_OP_BEACONS;
for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {

4
drivers/net/wireless/iwlwifi/iwl-sta.c
View File

@ -297,7 +297,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap, u8 flags,
} }
EXPORT_SYMBOL(iwl_add_station); EXPORT_SYMBOL(iwl_add_station);
static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr) static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const u8 *addr)
{ {
unsigned long flags; unsigned long flags;
u8 sta_id = iwl_find_station(priv, addr); u8 sta_id = iwl_find_station(priv, addr);
@ -324,7 +324,7 @@ static void iwl_remove_sta_callback(struct iwl_priv *priv,
{ {
struct iwl_rem_sta_cmd *rm_sta = struct iwl_rem_sta_cmd *rm_sta =
(struct iwl_rem_sta_cmd *)cmd->cmd.payload; (struct iwl_rem_sta_cmd *)cmd->cmd.payload;
const char *addr = rm_sta->addr; const u8 *addr = rm_sta->addr;
if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",

2
net/mac80211/driver-trace.h
View File

@ -680,7 +680,7 @@ TRACE_EVENT(drv_ampdu_action,
__entry->ret = ret; __entry->ret = ret;
__entry->action = action; __entry->action = action;
__entry->tid = tid; __entry->tid = tid;
__entry->ssn = *ssn; __entry->ssn = ssn ? *ssn : 0;
), ),
TP_printk( TP_printk(