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

Commit 44f2c5c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits)
  net: can: janz-ican3: world-writable sysfs termination file
  net: can: at91_can: world-writable sysfs files
  MAINTAINERS: update email ids of the be2net driver maintainers.
  bridge: Don't put partly initialized fdb into hash
  r8169: prevent RxFIFO induced loops in the irq handler.
  r8169: RxFIFO overflow oddities with 8168 chipsets.
  r8169: use RxFIFO overflow workaround for 8168c chipset.
  include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument
  net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.
  net: Support compat SIOCGETVIFCNT ioctl in ipv4.
  net: Fix bug in compat SIOCGETSGCNT handling.
  niu: Fix races between up/down and get_stats.
  tcp_ecn is an integer not a boolean
  atl1c: Add missing PCI device ID
  s390: Fix possibly wrong size in strncmp (smsgiucv)
  s390: Fix wrong size in memcmp (netiucv)
  qeth: allow OSA CHPARM change in suspend state
  qeth: allow HiperSockets framesize change in suspend
  qeth: add more strict MTU checking
  qeth: show new mac-address if its setting fails
  ...
parents 78d29788 1e6d93e4

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ tcp_cookie_size - INTEGER 
tcp_dsack - BOOLEAN

tcp_dsack - BOOLEAN

	Allows TCP to send "duplicate" SACKs.

	Allows TCP to send "duplicate" SACKs.





tcp_ecn - BOOLEAN

tcp_ecn - INTEGER

	Enable Explicit Congestion Notification (ECN) in TCP. ECN is only

	Enable Explicit Congestion Notification (ECN) in TCP. ECN is only

	used when both ends of the TCP flow support it. It is useful to

	used when both ends of the TCP flow support it. It is useful to

	avoid losses due to congestion (when the bottleneck router supports

	avoid losses due to congestion (when the bottleneck router supports

MAINTAINERS

+7 −8
Original line number Original line Diff line number Diff line
@@ -5551,12 +5551,11 @@ S: Supported 
F:	drivers/scsi/be2iscsi/

F:	drivers/scsi/be2iscsi/





SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

M:	Sathya Perla <sathyap@serverengines.com>

M:	Sathya Perla <sathya.perla@emulex.com>

M:	Subbu Seetharaman <subbus@serverengines.com>

M:	Subbu Seetharaman <subbu.seetharaman@emulex.com>

M:	Sarveshwar Bandi <sarveshwarb@serverengines.com>

M:	Ajit Khaparde <ajit.khaparde@emulex.com>

M:	Ajit Khaparde <ajitk@serverengines.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.serverengines.com

W:	http://www.emulex.com

S:	Supported

S:	Supported

F:	drivers/net/benet/

F:	drivers/net/benet/
@@ -6787,12 +6786,12 @@ S: Maintained 
F:	drivers/net/wireless/wl1251/*

F:	drivers/net/wireless/wl1251/*





WL1271 WIRELESS DRIVER

WL1271 WIRELESS DRIVER

M:	Luciano Coelho <luciano.coelho@nokia.com>

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

S:	Maintained

F:	drivers/net/wireless/wl12xx/wl1271*

F:	drivers/net/wireless/wl12xx/

F:	include/linux/wl12xx.h

F:	include/linux/wl12xx.h





WL3501 WIRELESS PCMCIA CARD DRIVER

WL3501 WIRELESS PCMCIA CARD DRIVER

drivers/isdn/icn/icn.c

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

static int __init icn_init(void)

{

{

	char *p;

	char *p;

	char rev[20];

	char rev[21];





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

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

	dev.memaddr = (membase & 0x0ffc000);

	dev.memaddr = (membase & 0x0ffc000);
@@ -1638,6 +1638,7 @@ static int __init icn_init(void) 




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

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

		strncpy(rev, p + 1, 20);

		strncpy(rev, p + 1, 20);

		rev[20] = '\0';

		p = strchr(rev, '$');

		p = strchr(rev, '$');

		if (p)

		if (p)

			*p = 0;

			*p = 0;

drivers/net/atl1c/atl1c_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = { 
	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},

	/* required last entry */

	/* required last entry */

	{ 0 }

	{ 0 }

};

};

drivers/net/benet/be_main.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -312,11 +312,9 @@ void be_link_status_update(struct be_adapter *adapter, bool link_up) 
	if (adapter->link_up != link_up) {

	if (adapter->link_up != link_up) {

		adapter->link_speed = -1;

		adapter->link_speed = -1;

		if (link_up) {

		if (link_up) {

			netif_start_queue(netdev);

			netif_carrier_on(netdev);

			netif_carrier_on(netdev);

			printk(KERN_INFO "%s: Link up\n", netdev->name);

			printk(KERN_INFO "%s: Link up\n", netdev->name);

		} else {

		} else {

			netif_stop_queue(netdev);

			netif_carrier_off(netdev);

			netif_carrier_off(netdev);

			printk(KERN_INFO "%s: Link down\n", netdev->name);

			printk(KERN_INFO "%s: Link down\n", netdev->name);

		}

		}
@@ -2628,8 +2626,6 @@ static void be_netdev_init(struct net_device *netdev) 




	netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,

	netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,

		BE_NAPI_WEIGHT);

		BE_NAPI_WEIGHT);



	netif_stop_queue(netdev);

}

}





static void be_unmap_pci_bars(struct be_adapter *adapter)

static void be_unmap_pci_bars(struct be_adapter *adapter)