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

Commit 24912420 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/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c
parents 0670b8ae 0302b862

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,13 @@ W: http://www.chelsio.com 
S:	Supported

F:	drivers/net/cxgb4vf/



STMMAC ETHERNET DRIVER

M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>

L:	netdev@vger.kernel.org

W:	http://www.stlinux.com

S:	Supported

F:	drivers/net/stmmac/



CYBERPRO FB DRIVER

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

drivers/net/3c59x.c

+4 −2
Original line number Diff line number Diff line
@@ -699,7 +699,8 @@ DEFINE_WINDOW_IO(32) 
#define DEVICE_PCI(dev) NULL

#endif



#define VORTEX_PCI(vp) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL)

#define VORTEX_PCI(vp)							\

	((struct pci_dev *) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL))



#ifdef CONFIG_EISA

#define DEVICE_EISA(dev) (((dev)->bus == &eisa_bus_type) ? to_eisa_device((dev)) : NULL)
@@ -707,7 +708,8 @@ DEFINE_WINDOW_IO(32) 
#define DEVICE_EISA(dev) NULL

#endif



#define VORTEX_EISA(vp) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL)

#define VORTEX_EISA(vp)							\

	((struct eisa_device *) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL))



/* The action to take with a media selection timer tick.

   Note that we deviate from the 3Com order by checking 10base2 before AUI.

drivers/net/8139cp.c

+4 −6
Original line number Diff line number Diff line
@@ -490,12 +490,10 @@ static inline unsigned int cp_rx_csum_ok (u32 status) 
{

	unsigned int protocol = (status >> 16) & 0x3;



	if (likely((protocol == RxProtoTCP) && (!(status & TCPFail))))

		return 1;

	else if ((protocol == RxProtoUDP) && (!(status & UDPFail)))

		return 1;

	else if ((protocol == RxProtoIP) && (!(status & IPFail)))

	if (((protocol == RxProtoTCP) && !(status & TCPFail)) ||

	    ((protocol == RxProtoUDP) && !(status & UDPFail)))

		return 1;

	else

		return 0;

}

drivers/net/benet/be_main.c

+6 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,12 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) 
	int status, i = 0, num_imgs = 0;

	const u8 *p;



	if (!netif_running(adapter->netdev)) {

		dev_err(&adapter->pdev->dev,

			"Firmware load not allowed (interface is down)\n");

		return -EPERM;

	}



	strcpy(fw_file, func);



	status = request_firmware(&fw, fw_file, &adapter->pdev->dev);

drivers/net/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -9064,7 +9064,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, 
	default:

		pr_err("Unknown board_type (%ld), aborting\n",

			   ent->driver_data);

		return ENODEV;

		return -ENODEV;

	}



	cid_count += CNIC_CONTEXT_USE;