Commit b09331e5 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: (55 commits)
  sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
  sctp: correct bounds check in sctp_setsockopt_auth_key
  wan: Missing capability checks in sbni_ioctl()
  e100, fix iomap read
  qeth: preallocated header account offset
  qeth: l2 write unicast list to hardware
  qeth: use -EOPNOTSUPP instead of -ENOTSUPP.
  ibm_newemac: Don't call dev_mc_add() before device is registered
  net: don't grab a mutex within a timer context in gianfar
  forcedeth: fix checksum flag
  net/usb/mcs7830: add set_mac_address
  net/usb/mcs7830: new device IDs
  [netdrvr] smc91x: fix resource removal (null ptr deref)
  ibmveth: fix bad UDP checksums
  [netdrvr] hso: dev_kfree_skb crash fix
  [netdrvr] hso: icon 322 detection fix
  atl1: disable TSO by default
  atl1e: multistatement if missing braces
  igb: remove 82576 quad adapter
  drivers/net/skfp/ess.c: fix compile warnings
  ...
parents 4c246edd d9724055

arch/powerpc/include/asm/cpm2.h

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ typedef struct scc_param { 
	uint	scc_tcrc;	/* Internal */

} sccp_t;



/* Function code bits.

*/

#define SCC_EB	((u_char) 0x10)	/* Set big endian byte order */

#define SCC_GBL	((u_char) 0x20) /* Snooping enabled */



/* CPM Ethernet through SCC1.

 */

typedef struct scc_enet {

drivers/net/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -822,14 +822,14 @@ config ULTRA32 
	  will be called smc-ultra32.



config BFIN_MAC

	tristate "Blackfin 527/536/537 on-chip mac support"

	depends on NET_ETHERNET && (BF527 || BF537 || BF536)

	tristate "Blackfin on-chip MAC support"

	depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537)

	select CRC32

	select MII

	select PHYLIB

	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE

	help

	  This is the driver for blackfin on-chip mac device. Say Y if you want it

	  This is the driver for Blackfin on-chip mac device. Say Y if you want it

	  compiled into the kernel. This driver is also available as a module

	  ( = code which can be inserted in and removed from the running kernel

	  whenever you want). The module will be called bfin_mac.

drivers/net/atl1e/atl1e_main.c

+2 −1
Original line number Diff line number Diff line
@@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) 


	AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);



	if (netif_running(netdev))

	if (netif_running(netdev)) {

		err = atl1e_request_irq(adapter);

		if (err)

			return err;

	}



	atl1e_reset_hw(&adapter->hw);

drivers/net/atlx/atl1.c

+0 −1
Original line number Diff line number Diff line
@@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, 
	netdev->features = NETIF_F_HW_CSUM;

	netdev->features |= NETIF_F_SG;

	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);

	netdev->features |= NETIF_F_TSO;

	netdev->features |= NETIF_F_LLTX;



	/*

drivers/net/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 
		if ((le16_to_cpu(rfd->command) & cb_el) &&

		    (RU_RUNNING == nic->ru_running))



			if (readb(&nic->csr->scb.status) & rus_no_res)

			if (ioread8(&nic->csr->scb.status) & rus_no_res)

				nic->ru_running = RU_SUSPENDED;

		return -ENODATA;

	}
@@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 
	if ((le16_to_cpu(rfd->command) & cb_el) &&

	    (RU_RUNNING == nic->ru_running)) {



	    if (readb(&nic->csr->scb.status) & rus_no_res)

	    if (ioread8(&nic->csr->scb.status) & rus_no_res)

		nic->ru_running = RU_SUSPENDED;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE