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

Commit bd4a6974 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

parents 2b7bcebf 1e6d93e4

Documentation/networking/ip-sysctl.txt

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

	Allows TCP to send "duplicate" SACKs.



tcp_ecn - BOOLEAN

tcp_ecn - INTEGER

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

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

	avoid losses due to congestion (when the bottleneck router supports

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -5544,12 +5544,11 @@ S: Supported 
F:	drivers/scsi/be2iscsi/



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

M:	Sathya Perla <sathyap@serverengines.com>

M:	Subbu Seetharaman <subbus@serverengines.com>

M:	Sarveshwar Bandi <sarveshwarb@serverengines.com>

M:	Ajit Khaparde <ajitk@serverengines.com>

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

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

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

L:	netdev@vger.kernel.org

W:	http://www.serverengines.com

W:	http://www.emulex.com

S:	Supported

F:	drivers/net/benet/

drivers/isdn/icn/icn.c

+2 −1
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[20];

	char rev[21];



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

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


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

		strncpy(rev, p + 1, 20);

		rev[20] = '\0';

		p = strchr(rev, '$');

		if (p)

			*p = 0;

drivers/net/atl1c/atl1c_main.c

+1 −0
Original line number 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_B2)},

	{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 */

	{ 0 }

};

drivers/net/benet/be_main.c

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

		adapter->link_speed = -1;

		if (link_up) {

			netif_start_queue(netdev);

			netif_carrier_on(netdev);

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

		} else {

			netif_stop_queue(netdev);

			netif_carrier_off(netdev);

			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,

		BE_NAPI_WEIGHT);



	netif_stop_queue(netdev);

}



static void be_unmap_pci_bars(struct be_adapter *adapter)