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

Commit 02f1ce35 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 5eccdf5e 82e5fc2a

drivers/net/wireless/p54/p54spi.c

+3 −2
Original line number Diff line number Diff line
@@ -588,8 +588,6 @@ static void p54spi_op_stop(struct ieee80211_hw *dev) 


	WARN_ON(priv->fw_state != FW_STATE_READY);



	cancel_work_sync(&priv->work);



	p54spi_power_off(priv);

	spin_lock_irqsave(&priv->tx_lock, flags);

	INIT_LIST_HEAD(&priv->tx_pending);
@@ -597,6 +595,8 @@ static void p54spi_op_stop(struct ieee80211_hw *dev) 


	priv->fw_state = FW_STATE_OFF;

	mutex_unlock(&priv->mutex);



	cancel_work_sync(&priv->work);

}



static int __devinit p54spi_probe(struct spi_device *spi)
@@ -656,6 +656,7 @@ static int __devinit p54spi_probe(struct spi_device *spi) 
	init_completion(&priv->fw_comp);

	INIT_LIST_HEAD(&priv->tx_pending);

	mutex_init(&priv->mutex);

	spin_lock_init(&priv->tx_lock);

	SET_IEEE80211_DEV(hw, &spi->dev);

	priv->common.open = p54spi_op_start;

	priv->common.stop = p54spi_op_stop;

drivers/net/wireless/prism54/isl_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, 
		dwrq->flags = 0;

		dwrq->length = 0;

	}

	essid->octets[essid->length] = '\0';

	essid->octets[dwrq->length] = '\0';

	memcpy(extra, essid->octets, dwrq->length);

	kfree(essid);

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3771,7 +3771,7 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i) 
	/* Apparently the data is read from end to start */

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);

	/* The returned value is in CPU order, but eeprom is le */

	rt2x00dev->eeprom[i] = cpu_to_le32(reg);

	*(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg);

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);

	*(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);

	rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);

net/mac80211/debugfs_sta.c

+2 −2
Original line number Diff line number Diff line
@@ -274,9 +274,9 @@ static ssize_t sta_ht_capa_read(struct file *file, char __user *userbuf, 


		PRINT_HT_CAP((htc->cap & BIT(10)), "HT Delayed Block Ack");



		PRINT_HT_CAP((htc->cap & BIT(11)), "Max AMSDU length: "

			     "3839 bytes");

		PRINT_HT_CAP(!(htc->cap & BIT(11)), "Max AMSDU length: "

			     "3839 bytes");

		PRINT_HT_CAP((htc->cap & BIT(11)), "Max AMSDU length: "

			     "7935 bytes");



		/*

net/mac80211/status.c

+4 −4
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_supported_band 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_radiotap_header *rthdr;

	unsigned char *pos;

	__le16 txflags;

	u16 txflags;



	rthdr = (struct ieee80211_radiotap_header *) skb_push(skb, rtap_len);
@@ -290,13 +290,13 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_supported_band 
	txflags = 0;

	if (!(info->flags & IEEE80211_TX_STAT_ACK) &&

	    !is_multicast_ether_addr(hdr->addr1))

		txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_FAIL);

		txflags |= IEEE80211_RADIOTAP_F_TX_FAIL;



	if ((info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) ||

	    (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT))

		txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_CTS);

		txflags |= IEEE80211_RADIOTAP_F_TX_CTS;

	else if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)

		txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_RTS);

		txflags |= IEEE80211_RADIOTAP_F_TX_RTS;



	put_unaligned_le16(txflags, pos);

	pos += 2;