Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next (9687c637) · Commits · 戴 / test

Documentation/DocBook/80211.tmpl

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -433,8 +433,18 @@
	Insert notes about VLAN interfaces with hw crypto here or		Insert notes about VLAN interfaces with hw crypto here or
	in the hw crypto chapter.		in the hw crypto chapter.
	</para>		</para>
			<section id="ps-client">
			<title>support for powersaving clients</title>
			!Pinclude/net/mac80211.h AP support for powersaving clients
			</section>
	!Finclude/net/mac80211.h ieee80211_get_buffered_bc		!Finclude/net/mac80211.h ieee80211_get_buffered_bc
	!Finclude/net/mac80211.h ieee80211_beacon_get		!Finclude/net/mac80211.h ieee80211_beacon_get
			!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe
			!Finclude/net/mac80211.h ieee80211_frame_release_type
			!Finclude/net/mac80211.h ieee80211_sta_ps_transition
			!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni
			!Finclude/net/mac80211.h ieee80211_sta_set_buffered
			!Finclude/net/mac80211.h ieee80211_sta_block_awake
	</chapter>		</chapter>

	<chapter id="multi-iface">		<chapter id="multi-iface">
	@@ -460,7 +470,6 @@
	!Finclude/net/mac80211.h sta_notify_cmd		!Finclude/net/mac80211.h sta_notify_cmd
	!Finclude/net/mac80211.h ieee80211_find_sta		!Finclude/net/mac80211.h ieee80211_find_sta
	!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr		!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr
	!Finclude/net/mac80211.h ieee80211_sta_block_awake
	</chapter>		</chapter>

	<chapter id="hardware-scan-offload">		<chapter id="hardware-scan-offload">

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -594,9 +594,18 @@ Why: In 3.0, we can now autodetect internal 3G device and already have
	Who: Lee, Chun-Yi <jlee@novell.com>		Who: Lee, Chun-Yi <jlee@novell.com>

	----------------------------		----------------------------

	What: The XFS nodelaylog mount option		What: The XFS nodelaylog mount option
	When: 3.3		When: 3.3
	Why: The delaylog mode that has been the default since 2.6.39 has proven		Why: The delaylog mode that has been the default since 2.6.39 has proven
	stable, and the old code is in the way of additional improvements in		stable, and the old code is in the way of additional improvements in
	the log code.		the log code.
	Who: Christoph Hellwig <hch@lst.de>		Who: Christoph Hellwig <hch@lst.de>

			----------------------------

			What: iwlagn alias support
			When: 3.5
			Why: The iwlagn module has been renamed iwlwifi. The alias will be around
			for backward compatibility for several cycles and then dropped.
			Who: Don Fry <donald.h.fry@intel.com>

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,9 @@ static struct usb_device_id btusb_table[] = {
	/* Generic Bluetooth USB device */		/* Generic Bluetooth USB device */
	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },		{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },

			/* Broadcom SoftSailing reporting vendor specific */
			{ USB_DEVICE(0x05ac, 0x21e1) },

	/* Apple MacBookPro 7,1 */		/* Apple MacBookPro 7,1 */
	{ USB_DEVICE(0x05ac, 0x8213) },		{ USB_DEVICE(0x05ac, 0x8213) },

	@@ -708,8 +711,7 @@ static int btusb_send_frame(struct sk_buff *skb)
	break;		break;

	case HCI_ACLDATA_PKT:		case HCI_ACLDATA_PKT:
	if (!data->bulk_tx_ep \|\| (hdev->conn_hash.acl_num < 1 &&		if (!data->bulk_tx_ep)
	hdev->conn_hash.le_num < 1))
	return -ENODEV;		return -ENODEV;

	urb = usb_alloc_urb(0, GFP_ATOMIC);		urb = usb_alloc_urb(0, GFP_ATOMIC);

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o

	obj-$(CONFIG_MWL8K) += mwl8k.o		obj-$(CONFIG_MWL8K) += mwl8k.o

	obj-$(CONFIG_IWLAGN) += iwlwifi/		obj-$(CONFIG_IWLWIFI) += iwlwifi/
	obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/		obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/
	obj-$(CONFIG_RT2X00) += rt2x00/		obj-$(CONFIG_RT2X00) += rt2x00/

+8 −10

Original line number	Original line	Diff line number	Diff line
	@@ -500,10 +500,9 @@ exit:

	#define HEX2STR_BUFFERS 4		#define HEX2STR_BUFFERS 4
	#define HEX2STR_MAX_LEN 64		#define HEX2STR_MAX_LEN 64
	#define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10)

	/* Convert binary data into hex string */		/* Convert binary data into hex string */
	static char hex2str(void buf, int len)		static char hex2str(void buf, size_t len)
	{		{
	static atomic_t a = ATOMIC_INIT(0);		static atomic_t a = ATOMIC_INIT(0);
	static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];		static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];
	@@ -514,18 +513,17 @@ static char hex2str(void buf, int len)
	if (len > HEX2STR_MAX_LEN)		if (len > HEX2STR_MAX_LEN)
	len = HEX2STR_MAX_LEN;		len = HEX2STR_MAX_LEN;

	if (len <= 0) {		if (len == 0)
	ret[0] = '\0';		goto exit;
	return ret;
	}

	while (len--) {		while (len--) {
	obuf++ = BIN2HEX(ibuf >> 4);		obuf = pack_hex_byte(obuf, *ibuf++);
	obuf++ = BIN2HEX(ibuf & 0xf);
	*obuf++ = '-';		*obuf++ = '-';
	ibuf++;
	}		}
	*(--obuf) = '\0';		obuf--;

			exit:
			*obuf = '\0';

	return ret;		return ret;
	}		}