Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
David S. Miller 2012-01-27 20:40:18 -05:00
commit cc0d7b91db
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
View file

@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
} }
#endif #endif
spin_unlock_irqrestore(&trans->shrd->lock, flags);
/* saved interrupt in inta variable now we can reset trans_pcie->inta */ /* saved interrupt in inta variable now we can reset trans_pcie->inta */
trans_pcie->inta = 0; trans_pcie->inta = 0;
spin_unlock_irqrestore(&trans->shrd->lock, flags);
/* Now service all interrupt bits discovered above. */ /* Now service all interrupt bits discovered above. */
if (inta & CSR_INT_BIT_HW_ERR) { if (inta & CSR_INT_BIT_HW_ERR) {
IWL_ERR(trans, "Hardware error detected. Restarting.\n"); IWL_ERR(trans, "Hardware error detected. Restarting.\n");

1
net/mac80211/ibss.c
View file

@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0; sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
local->oper_channel = chan;
channel_type = ifibss->channel_type; channel_type = ifibss->channel_type;
if (channel_type > NL80211_CHAN_HT20 && if (channel_type > NL80211_CHAN_HT20 &&
!cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type)) !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))

1
net/mac80211/iface.c
View file

@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
continue; continue;
} }
/* count everything else */ /* count everything else */
sdata->vif.bss_conf.idle = false;
count++; count++;
} }