Commit b171e19e 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:

	net/mac80211/mlme.c
parents 143b11c0 7c19a3d2

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/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ struct bnx2x_fastpath { 
			 (fp->tx_pkt_prod != fp->tx_pkt_cons))



#define BNX2X_HAS_RX_WORK(fp) \

			(fp->rx_comp_cons != le16_to_cpu(*fp->rx_cons_sb))

			(fp->rx_comp_cons != rx_cons_sb)



#define BNX2X_HAS_WORK(fp)	(BNX2X_HAS_RX_WORK(fp) || BNX2X_HAS_TX_WORK(fp))