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

Commit 9316f0e3 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-next into for-davem
parents 7f2e6a5d 7a5f799b

drivers/bcma/main.c

+10 −0
Original line number Diff line number Diff line
@@ -227,7 +227,17 @@ int __devinit bcma_bus_register(struct bcma_bus *bus) 


void bcma_bus_unregister(struct bcma_bus *bus)

{

	struct bcma_device *cores[3];



	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);

	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);



	bcma_unregister_cores(bus);



	kfree(cores[2]);

	kfree(cores[1]);

	kfree(cores[0]);

}



int __init bcma_bus_early_register(struct bcma_bus *bus,

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C) },

	{ USB_DEVICE(0x0489, 0xE036) },



	{ }	/* Terminating entry */

};
@@ -109,6 +110,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 


	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+7 −5
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Generic Bluetooth USB device */

	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },



	/* Apple-specific (Broadcom) devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x05ac, 0xff, 0x01, 0x01) },



	/* Broadcom SoftSailing reporting vendor specific */

	{ USB_DEVICE(0x0a5c, 0x21e1) },
@@ -94,16 +97,14 @@ static struct usb_device_id btusb_table[] = { 


	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x0a5c, 0x21f4) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */

	{ USB_DEVICE(0x0489, 0xe033) },



	/*Broadcom devices with vendor specific id */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },



	{ }	/* Terminating entry */

};
@@ -141,6 +142,7 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 },



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

drivers/net/wireless/airo.c

+2 −5
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ static struct pci_driver airo_driver = { 
/* Include Wireless Extension definition and check version - Jean II */

#include <linux/wireless.h>

#define WIRELESS_SPY		/* enable iwspy support */

#include <net/iw_handler.h>	/* New driver API */



#define CISCO_EXT		/* enable Cisco extensions */

#ifdef CISCO_EXT
@@ -5984,13 +5983,11 @@ static int airo_set_wap(struct net_device *dev, 
	Cmd cmd;

	Resp rsp;

	APListRid APList_rid;

	static const u8 any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };

	static const u8 off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };



	if (awrq->sa_family != ARPHRD_ETHER)

		return -EINVAL;

	else if (!memcmp(any, awrq->sa_data, ETH_ALEN) ||

	         !memcmp(off, awrq->sa_data, ETH_ALEN)) {

	else if (is_broadcast_ether_addr(awrq->sa_data) ||

		 is_zero_ether_addr(awrq->sa_data)) {

		memset(&cmd, 0, sizeof(cmd));

		cmd.cmd=CMD_LOSE_SYNC;

		if (down_interruptible(&local->sem))

drivers/net/wireless/at76c50x-usb.c

+12 −42
Original line number Diff line number Diff line
@@ -498,36 +498,6 @@ exit: 
	return ret;

}



#define HEX2STR_BUFFERS 4

#define HEX2STR_MAX_LEN 64



/* Convert binary data into hex string */

static char *hex2str(void *buf, size_t len)

{

	static atomic_t a = ATOMIC_INIT(0);

	static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];

	char *ret = bufs[atomic_inc_return(&a) & (HEX2STR_BUFFERS - 1)];

	char *obuf = ret;

	u8 *ibuf = buf;



	if (len > HEX2STR_MAX_LEN)

		len = HEX2STR_MAX_LEN;



	if (len == 0)

		goto exit;



	while (len--) {

		obuf = hex_byte_pack(obuf, *ibuf++);

		*obuf++ = '-';

	}

	obuf--;



exit:

	*obuf = '\0';



	return ret;

}



/* LED trigger */

static int tx_activity;

static void at76_ledtrig_tx_timerfunc(unsigned long data);
@@ -1004,9 +974,9 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv) 
	    WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;



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

		at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s",

		at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %*phD",

			 wiphy_name(priv->hw->wiphy), i,

			 hex2str(m->wep_default_keyvalue[i], key_len));

			 key_len, m->wep_default_keyvalue[i]);

exit:

	kfree(m);

}
@@ -1031,7 +1001,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) 
	at76_dbg(DBG_MIB, "%s: MIB MAC_MGMT: beacon_period %d CFP_max_duration "

		 "%d medium_occupancy_limit %d station_id 0x%x ATIM_window %d "

		 "CFP_mode %d privacy_opt_impl %d DTIM_period %d CFP_period %d "

		 "current_bssid %pM current_essid %s current_bss_type %d "

		 "current_bssid %pM current_essid %*phD current_bss_type %d "

		 "pm_mode %d ibss_change %d res %d "

		 "multi_domain_capability_implemented %d "

		 "international_roaming %d country_string %.3s",
@@ -1041,7 +1011,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) 
		 le16_to_cpu(m->station_id), le16_to_cpu(m->ATIM_window),

		 m->CFP_mode, m->privacy_option_implemented, m->DTIM_period,

		 m->CFP_period, m->current_bssid,

		 hex2str(m->current_essid, IW_ESSID_MAX_SIZE),

		 IW_ESSID_MAX_SIZE, m->current_essid,

		 m->current_bss_type, m->power_mgmt_mode, m->ibss_change,

		 m->res, m->multi_domain_capability_implemented,

		 m->multi_domain_capability_enabled, m->country_string);
@@ -1069,7 +1039,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) 
		 "cwmin %d cwmax %d short_retry_time %d long_retry_time %d "

		 "scan_type %d scan_channel %d probe_delay %u "

		 "min_channel_time %d max_channel_time %d listen_int %d "

		 "desired_ssid %s desired_bssid %pM desired_bsstype %d",

		 "desired_ssid %*phD desired_bssid %pM desired_bsstype %d",

		 wiphy_name(priv->hw->wiphy),

		 le32_to_cpu(m->max_tx_msdu_lifetime),

		 le32_to_cpu(m->max_rx_lifetime),
@@ -1080,7 +1050,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) 
		 le16_to_cpu(m->min_channel_time),

		 le16_to_cpu(m->max_channel_time),

		 le16_to_cpu(m->listen_interval),

		 hex2str(m->desired_ssid, IW_ESSID_MAX_SIZE),

		 IW_ESSID_MAX_SIZE, m->desired_ssid,

		 m->desired_bssid, m->desired_bsstype);

exit:

	kfree(m);
@@ -1160,13 +1130,13 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv) 
		goto exit;

	}



	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s",

	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %*phD",

		 wiphy_name(priv->hw->wiphy),

		 hex2str(m->channel_list, sizeof(m->channel_list)));

		 (int)sizeof(m->channel_list), m->channel_list);



	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s",

	at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %*phD",

		 wiphy_name(priv->hw->wiphy),

		 hex2str(m->tx_powerlevel, sizeof(m->tx_powerlevel)));

		 (int)sizeof(m->tx_powerlevel), m->tx_powerlevel);

exit:

	kfree(m);

}
@@ -1369,9 +1339,9 @@ static int at76_startup_device(struct at76_priv *priv) 
	int ret;



	at76_dbg(DBG_PARAMS,

		 "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d "

		 "%s param: ssid %.*s (%*phD) mode %s ch %d wep %s key %d "

		 "keylen %d", wiphy_name(priv->hw->wiphy), priv->essid_size,

		 priv->essid, hex2str(priv->essid, IW_ESSID_MAX_SIZE),

		 priv->essid, IW_ESSID_MAX_SIZE, priv->essid,

		 priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",

		 priv->channel, priv->wep_enabled ? "enabled" : "disabled",

		 priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]);