Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0d7b91 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 9018e939 b49ba04a

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

+2 −2
Original line number Diff line number Diff line
@@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans) 
	}

#endif



	spin_unlock_irqrestore(&trans->shrd->lock, flags);



	/* saved interrupt in inta variable now we can reset trans_pcie->inta */

	trans_pcie->inta = 0;



	spin_unlock_irqrestore(&trans->shrd->lock, flags);



	/* Now service all interrupt bits discovered above. */

	if (inta & CSR_INT_BIT_HW_ERR) {

		IWL_ERR(trans, "Hardware error detected.  Restarting.\n");

net/mac80211/ibss.c

+1 −0
Original line number Diff line number Diff line
@@ -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;



	local->oper_channel = chan;

	channel_type = ifibss->channel_type;

	if (channel_type > NL80211_CHAN_HT20 &&

	    !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))

net/mac80211/iface.c

+1 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) 
			continue;

		}

		/* count everything else */

		sdata->vif.bss_conf.idle = false;

		count++;

	}