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

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

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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c
parents f8bf5681 f1987257

Documentation/networking/ip-sysctl.txt

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ tcp_adv_win_scale - INTEGER 
	Count buffering overhead as bytes/2^tcp_adv_win_scale

	(if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale),

	if it is <= 0.

	Possible values are [-31, 31], inclusive.

	Default: 2



tcp_allowed_congestion_control - STRING

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ F: include/net/bluetooth/ 


BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

L:	bonding-devel@lists.sourceforge.net

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/

S:	Supported

F:	drivers/net/bonding/

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
static struct usb_device_id ath3k_table[] = {

	/* Atheros AR3011 */

	{ USB_DEVICE(0x0CF3, 0x3000) },



	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+9 −3
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ static struct usb_device_id blacklist_table[] = { 
	/* Broadcom BCM2033 without firmware */

	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },



	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },



	/* Broadcom BCM2035 */

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

	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -239,6 +242,7 @@ static void btusb_intr_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -323,6 +327,7 @@ static void btusb_bulk_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);
@@ -412,6 +417,7 @@ static void btusb_isoc_complete(struct urb *urb) 


	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err < 0) {

		if (err != -EPERM)

			BT_ERR("%s urb %p failed to resubmit (%d)",

						hdev->name, urb, -err);

		usb_unanchor_urb(urb);

drivers/isdn/icn/icn.c

+4 −3
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ __setup("icn=", icn_setup); 
static int __init icn_init(void)

{

	char *p;

	char rev[10];

	char rev[20];



	memset(&dev, 0, sizeof(icn_dev));

	dev.memaddr = (membase & 0x0ffc000);
@@ -1637,8 +1637,9 @@ static int __init icn_init(void) 
	spin_lock_init(&dev.devlock);



	if ((p = strchr(revision, ':'))) {

		strcpy(rev, p + 1);

		strncpy(rev, p + 1, 20);

		p = strchr(rev, '$');

		if (p)

			*p = 0;

	} else

		strcpy(rev, " ??? ");