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

Commit e1703b36 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/e100.c
	drivers/net/e1000e/netdev.c
parents 7ec75c58 e95ef5d3

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ obj-$(CONFIG_USB_RTL8150) += usb/ 
obj-$(CONFIG_USB_HSO)		+= usb/

obj-$(CONFIG_USB_USBNET)        += usb/

obj-$(CONFIG_USB_ZD1201)        += usb/

obj-$(CONFIG_USB_IPHETH)        += usb/



obj-y += wireless/

obj-$(CONFIG_NET_TULIP) += tulip/

drivers/net/can/usb/ems_usb.c

+4 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static int ems_usb_probe(struct usb_interface *intf, 


	netdev = alloc_candev(sizeof(struct ems_usb), MAX_TX_URBS);

	if (!netdev) {

		dev_err(netdev->dev.parent, "Couldn't alloc candev\n");

		dev_err(&intf->dev, "ems_usb: Couldn't alloc candev\n");

		return -ENOMEM;

	}
@@ -1036,20 +1036,20 @@ static int ems_usb_probe(struct usb_interface *intf, 


	dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->intr_urb) {

		dev_err(netdev->dev.parent, "Couldn't alloc intr URB\n");

		dev_err(&intf->dev, "Couldn't alloc intr URB\n");

		goto cleanup_candev;

	}



	dev->intr_in_buffer = kzalloc(INTR_IN_BUFFER_SIZE, GFP_KERNEL);

	if (!dev->intr_in_buffer) {

		dev_err(netdev->dev.parent, "Couldn't alloc Intr buffer\n");

		dev_err(&intf->dev, "Couldn't alloc Intr buffer\n");

		goto cleanup_intr_urb;

	}



	dev->tx_msg_buffer = kzalloc(CPC_HEADER_SIZE +

				     sizeof(struct ems_cpc_msg), GFP_KERNEL);

	if (!dev->tx_msg_buffer) {

		dev_err(netdev->dev.parent, "Couldn't alloc Tx buffer\n");

		dev_err(&intf->dev, "Couldn't alloc Tx buffer\n");

		goto cleanup_intr_in_buffer;

	}

drivers/net/cxgb3/ael1002.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = { 
int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,

			    int phy_addr, const struct mdio_ops *mdio_ops)

{

	cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops,

	cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops,

		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,

		  "10GBASE-CX4");

	return 0;

drivers/net/cxgb3/cxgb3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static void free_irq_resources(struct adapter *adapter) 
static int await_mgmt_replies(struct adapter *adap, unsigned long init_cnt,

			      unsigned long n)

{

	int attempts = 5;

	int attempts = 10;



	while (adap->sge.qs[0].rspq.offload_pkts < init_cnt + n) {

		if (!--attempts)

drivers/net/e100.c

+8 −2
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#include <linux/ethtool.h>

#include <linux/string.h>

#include <linux/firmware.h>

#include <linux/rtnetlink.h>

#include <asm/unaligned.h>
@@ -2280,9 +2281,14 @@ static void e100_tx_timeout_task(struct work_struct *work) 


	netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,

		     "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status));



	rtnl_lock();

	if (netif_running(netdev)) {

		e100_down(netdev_priv(netdev));

		e100_up(netdev_priv(netdev));

	}

	rtnl_unlock();

}



static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)

{