Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (54f5ffbf) · Commits · e / devices / android_kernel_sony_msm8998

MAINTAINERS

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3553,17 +3553,13 @@ L: linux-pm@vger.kernel.org
	S: Supported		S: Supported
	F: arch/x86/platform/mrst/pmu.*		F: arch/x86/platform/mrst/pmu.*

	INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT		INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
			M: Stanislav Yakovlev <stas.yakovlev@gmail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Orphan		S: Maintained
	F: Documentation/networking/README.ipw2100		F: Documentation/networking/README.ipw2100
	F: drivers/net/wireless/ipw2x00/ipw2100.*

	INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
	L: linux-wireless@vger.kernel.org
	S: Orphan
	F: Documentation/networking/README.ipw2200		F: Documentation/networking/README.ipw2200
	F: drivers/net/wireless/ipw2x00/ipw2200.*		F: drivers/net/wireless/ipw2x00/

	INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)		INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
	M: Joseph Cihula <joseph.cihula@intel.com>		M: Joseph Cihula <joseph.cihula@intel.com>

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -640,7 +640,7 @@ static void ath_node_attach(struct ath_softc sc, struct ieee80211_sta sta,
	an->sta = sta;		an->sta = sta;
	an->vif = vif;		an->vif = vif;

	if (sta->ht_cap.ht_supported) {		if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
	ath_tx_node_init(sc, an);		ath_tx_node_init(sc, an);
	an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +		an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
	sta->ht_cap.ampdu_factor);		sta->ht_cap.ampdu_factor);
	@@ -659,7 +659,7 @@ static void ath_node_detach(struct ath_softc sc, struct ieee80211_sta sta)
	an->sta = NULL;		an->sta = NULL;
	#endif		#endif

	if (sta->ht_cap.ht_supported)		if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
	ath_tx_node_cleanup(sc, an);		ath_tx_node_cleanup(sc, an);
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11507,9 +11507,9 @@ static int ipw_wdev_init(struct net_device *dev)
	rc = -ENOMEM;		rc = -ENOMEM;
	goto out;		goto out;
	}		}
	/* translate geo->bg to a_band.channels */		/* translate geo->a to a_band.channels */
	for (i = 0; i < geo->a_channels; i++) {		for (i = 0; i < geo->a_channels; i++) {
	a_band->channels[i].band = IEEE80211_BAND_2GHZ;		a_band->channels[i].band = IEEE80211_BAND_5GHZ;
	a_band->channels[i].center_freq = geo->a[i].freq;		a_band->channels[i].center_freq = geo->a[i].freq;
	a_band->channels[i].hw_value = geo->a[i].channel;		a_band->channels[i].hw_value = geo->a[i].channel;
	a_band->channels[i].max_power = geo->a[i].max_power;		a_band->channels[i].max_power = geo->a[i].max_power;

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1336,6 +1336,10 @@ static void qbuf_scan(struct orinoco_private priv, void buf,
	unsigned long flags;		unsigned long flags;

	sd = kmalloc(sizeof(*sd), GFP_ATOMIC);		sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
			if (!sd) {
			printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
			return;
			}
	sd->buf = buf;		sd->buf = buf;
	sd->len = len;		sd->len = len;
	sd->type = type;		sd->type = type;
	@@ -1353,6 +1357,10 @@ static void qabort_scan(struct orinoco_private *priv)
	unsigned long flags;		unsigned long flags;

	sd = kmalloc(sizeof(*sd), GFP_ATOMIC);		sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
			if (!sd) {
			printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
			return;
			}
	sd->len = -1; /* Abort */		sd->len = -1; /* Abort */

	spin_lock_irqsave(&priv->scan_lock, flags);		spin_lock_irqsave(&priv->scan_lock, flags);

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -370,7 +370,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
	*/		*/
	drv_sw_scan_start(local);		drv_sw_scan_start(local);

	local->leave_oper_channel_time = 0;		local->leave_oper_channel_time = jiffies;
	local->next_scan_state = SCAN_DECISION;		local->next_scan_state = SCAN_DECISION;
	local->scan_channel_idx = 0;		local->scan_channel_idx = 0;