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

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

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

parents ed58dd41 c256e05b

drivers/net/wireless/b43legacy/main.c

+1 −1
Original line number Diff line number Diff line
@@ -3829,7 +3829,7 @@ static void b43legacy_print_driverinfo(void) 
#ifdef CONFIG_B43LEGACY_DMA

	feat_dma = "D";

#endif

	printk(KERN_INFO "Broadcom 43xx driver loaded "

	printk(KERN_INFO "Broadcom 43xx-legacy driver loaded "

	       "[ Features: %s%s%s%s%s, Firmware-ID: "

	       B43legacy_SUPPORTED_FIRMWARE_ID " ]\n",

	       feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma);

drivers/net/wireless/libertas/cmdresp.c

+3 −5
Original line number Diff line number Diff line
@@ -562,9 +562,7 @@ int lbs_process_rx_command(struct lbs_private *priv) 
	}



	resp = (void *)priv->upld_buf;



	curcmd = le16_to_cpu(resp->command);



	curcmd = le16_to_cpu(priv->cur_cmd->cmdbuf->command);

	respcmd = le16_to_cpu(resp->command);

	result = le16_to_cpu(resp->result);
@@ -572,9 +570,9 @@ int lbs_process_rx_command(struct lbs_private *priv) 
		     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);

	lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len);



	if (resp->seqnum != resp->seqnum) {

	if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {

		lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",

			    le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum));

			    le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum));

		spin_unlock_irqrestore(&priv->driver_lock, flags);

		ret = -1;

		goto done;

drivers/net/wireless/p54common.c

+12 −8
Original line number Diff line number Diff line
@@ -166,18 +166,23 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) 
	struct p54_common *priv = dev->priv;

	struct eeprom_pda_wrap *wrap = NULL;

	struct pda_entry *entry;

	int i = 0;

	unsigned int data_len, entry_len;

	void *tmp;

	int err;

	u8 *end = (u8 *)eeprom + len;



	wrap = (struct eeprom_pda_wrap *) eeprom;

	entry = (void *)wrap->data + wrap->len;

	i += 2;

	i += le16_to_cpu(entry->len)*2;

	while (i < len) {

	entry = (void *)wrap->data + le16_to_cpu(wrap->len);



	/* verify that at least the entry length/code fits */

	while ((u8 *)entry <= end - sizeof(*entry)) {

		entry_len = le16_to_cpu(entry->len);

		data_len = ((entry_len - 1) << 1);



		/* abort if entry exceeds whole structure */

		if ((u8 *)entry + sizeof(*entry) + data_len > end)

			break;



		switch (le16_to_cpu(entry->code)) {

		case PDR_MAC_ADDRESS:

			SET_IEEE80211_PERM_ADDR(dev, entry->data);
@@ -249,13 +254,12 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) 
			priv->version = *(u8 *)(entry->data + 1);

			break;

		case PDR_END:

			i = len;

			/* make it overrun */

			entry_len = len;

			break;

		}



		entry = (void *)entry + (entry_len + 1)*2;

		i += 2;

		i += entry_len*2;

	}



	if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) {

drivers/net/wireless/p54common.h

+4 −4
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ struct pda_entry { 
} __attribute__ ((packed));



struct eeprom_pda_wrap {

	u32 magic;

	u16 pad;

	u16 len;

	u32 arm_opcode;

	__le32 magic;

	__le16 pad;

	__le16 len;

	__le32 arm_opcode;

	u8 data[0];

} __attribute__ ((packed));

drivers/net/wireless/rndis_wlan.c

+3 −5
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct NDIS_802_11_KEY { 
	__le32 KeyLength;

	u8 Bssid[6];

	u8 Padding[6];

	__le64 KeyRSC;

	u8 KeyRSC[8];

	u8 KeyMaterial[32];

} __attribute__((packed));
@@ -1508,7 +1508,7 @@ static int rndis_iw_set_encode_ext(struct net_device *dev, 
	struct usbnet *usbdev = dev->priv;

	struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);

	struct NDIS_802_11_KEY ndis_key;

	int i, keyidx, ret;

	int keyidx, ret;

	u8 *addr;



	keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX;
@@ -1543,9 +1543,7 @@ static int rndis_iw_set_encode_ext(struct net_device *dev, 
	ndis_key.KeyIndex = cpu_to_le32(keyidx);



	if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {

		for (i = 0; i < 6; i++)

			ndis_key.KeyRSC |=

				cpu_to_le64(ext->rx_seq[i] << (i * 8));

		memcpy(ndis_key.KeyRSC, ext->rx_seq, 6);

		ndis_key.KeyIndex |= cpu_to_le32(1 << 29);

	}