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

Commit 8486a0f9 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: (60 commits)
  net: restore gnet_stats_basic to previous definition
  NETROM: Fix use of static buffer
  e1000e: fix use of pci_enable_pcie_error_reporting
  e1000e: WoL does not work on 82577/82578 with manageability enabled
  cnic: Fix locking in init/exit calls.
  cnic: Fix locking in start/stop calls.
  bnx2: Use mutex on slow path cnic calls.
  cnic: Refine registration with bnx2.
  cnic: Fix symbol_put_addr() panic on ia64.
  gre: Fix MTU calculation for bound GRE tunnels
  pegasus: Add new device ID.
  drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
  via-velocity: Fix test of mii_status bit VELOCITY_DUPLEX_FULL
  rt2x00: fix memory corruption in rf cache, add a sanity check
  ixgbe: Fix receive on real device when VLANs are configured
  ixgbe: Do not return 0 in ixgbe_fcoe_ddp() upon FCP_RSP in DDP completion
  netxen: free napi resources during detach
  netxen: remove netxen workqueue
  ixgbe: fix issues setting rx-usecs with legacy interrupts
  can: fix oops caused by wrong rtnl newlink usage
  ...
parents b9d030a1 c1a8f1f1

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ F: drivers/input/misc/ati_remote2.c 


ATLX ETHERNET DRIVERS

M:	Jay Cliburn <jcliburn@gmail.com>

M:	Chris Snook <csnook@redhat.com>

M:	Chris Snook <chris.snook@gmail.com>

M:	Jie Yang <jie.yang@atheros.com>

L:	atl1-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/atl1
@@ -3563,6 +3563,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git 
S:	Maintained

F:	net/

F:	include/net/

F:	include/linux/in.h

F:	include/linux/net.h

F:	include/linux/netdevice.h



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>
@@ -3598,6 +3601,8 @@ W: http://www.linuxfoundation.org/en/Net 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

S:	Odd Fixes

F:	drivers/net/

F:	include/linux/if_*

F:	include/linux/*device.h



NETXEN (1/10) GbE SUPPORT

M:	Dhananjay Phadke <dhananjay@netxen.com>

drivers/net/3c59x.c

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ enum vortex_chips { 
	CH_3C900B_FL,

	CH_3C905_1,

	CH_3C905_2,

	CH_3C905B_TX,

	CH_3C905B_1,



	CH_3C905B_2,
@@ -307,6 +308,8 @@ static struct vortex_chip_info { 
	 PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },

	{"3c905 Boomerang 100baseT4",

	 PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },

	{"3C905B-TX Fast Etherlink XL PCI",

	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },

	{"3c905B Cyclone 100baseTx",

	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
@@ -389,6 +392,7 @@ static struct pci_device_id vortex_pci_tbl[] = { 
	{ 0x10B7, 0x900A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900B_FL },

	{ 0x10B7, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_1 },

	{ 0x10B7, 0x9051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_2 },

	{ 0x10B7, 0x9054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_TX },

	{ 0x10B7, 0x9055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_1 },



	{ 0x10B7, 0x9058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_2 },

drivers/net/8139cp.c

+2 −3
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		dma_addr_t mapping;

		struct sk_buff *skb, *new_skb;

		struct cp_desc *desc;

		unsigned buflen;

		const unsigned buflen = cp->rx_buf_sz;



		skb = cp->rx_skb[rx_tail];

		BUG_ON(!skb);
@@ -549,8 +549,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
			pr_debug("%s: rx slot %d status 0x%x len %d\n",

			       dev->name, rx_tail, status, len);



		buflen = cp->rx_buf_sz + NET_IP_ALIGN;

		new_skb = netdev_alloc_skb(dev, buflen);

		new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN);

		if (!new_skb) {

			dev->stats.rx_dropped++;

			goto rx_next;

drivers/net/atl1c/atl1c_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -232,11 +232,11 @@ static void atl1c_get_drvinfo(struct net_device *netdev, 
{

	struct atl1c_adapter *adapter = netdev_priv(netdev);



	strncpy(drvinfo->driver,  atl1c_driver_name, sizeof(drvinfo->driver));

	strncpy(drvinfo->version, atl1c_driver_version,

	strlcpy(drvinfo->driver,  atl1c_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, atl1c_driver_version,

		sizeof(drvinfo->version));

	strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev),

	strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));

	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info));

	drvinfo->n_stats = 0;

	drvinfo->testinfo_len = 0;

drivers/net/atlx/atl1.c

+4 −4
Original line number Diff line number Diff line
@@ -3378,11 +3378,11 @@ static void atl1_get_drvinfo(struct net_device *netdev, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);



	strncpy(drvinfo->driver, ATLX_DRIVER_NAME, sizeof(drvinfo->driver));

	strncpy(drvinfo->version, ATLX_DRIVER_VERSION,

	strlcpy(drvinfo->driver, ATLX_DRIVER_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, ATLX_DRIVER_VERSION,

		sizeof(drvinfo->version));

	strncpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev),

	strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));

	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info));

	drvinfo->eedump_len = ATL1_EEDUMP_LEN;

}