Commit 9b963e5d 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/ieee802154/fakehard.c
	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/phy.c
	drivers/net/netxen/netxen_nic_init.c
	drivers/net/wireless/ath/ath9k/main.c
parents 3b8626ba 5fdd4bae

drivers/ieee802154/fakehard.c

+2 −2
Original line number Diff line number Diff line
@@ -284,13 +284,13 @@ static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb, 
{

	skb->skb_iif = dev->ifindex;

	skb->dev = dev;



	dev->stats.tx_packets++;

	dev->stats.tx_bytes += skb->len;



	dev->trans_start = jiffies;



	/* FIXME: do hardware work here ... */



	dev_kfree_skb(skb);

	return NETDEV_TX_OK;

}

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ config ENC28J60_WRITEVERIFY 


config ETHOC

	tristate "OpenCores 10/100 Mbps Ethernet MAC support"

	depends on NET_ETHERNET && HAS_IOMEM

	depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA

	select MII

	select PHYLIB

	select CRC32

drivers/net/au1000_eth.c

+8 −7
Original line number Diff line number Diff line
@@ -1088,7 +1088,14 @@ static struct net_device * au1000_probe(int port_num) 
		return NULL;

	}



	if ((err = register_netdev(dev)) != 0) {

	dev->base_addr = base;

	dev->irq = irq;

	dev->netdev_ops = &au1000_netdev_ops;

	SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);

	dev->watchdog_timeo = ETH_TX_TIMEOUT;



	err = register_netdev(dev);

	if (err != 0) {

		printk(KERN_ERR "%s: Cannot register net device, error %d\n",

				DRV_NAME, err);

		free_netdev(dev);
@@ -1209,12 +1216,6 @@ static struct net_device * au1000_probe(int port_num) 
		aup->tx_db_inuse[i] = pDB;

	}



	dev->base_addr = base;

	dev->irq = irq;

	dev->netdev_ops = &au1000_netdev_ops;

	SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);

	dev->watchdog_timeo = ETH_TX_TIMEOUT;



	/*

	 * The boot code uses the ethernet controller, so reset it to start

	 * fresh.  au1000_init() expects that the device is in reset state.

drivers/net/e1000e/e1000.h

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ struct e1000_info; 
#define HV_TNCRS_UPPER		PHY_REG(778, 29) /* Transmit with no CRS */

#define HV_TNCRS_LOWER		PHY_REG(778, 30)



#define E1000_FCRTV_PCH     0x05F40 /* PCH Flow Control Refresh Timer Value */



/* BM PHY Copper Specific Status */

#define BM_CS_STATUS                      17

#define BM_CS_STATUS_LINK_UP              0x0400

drivers/net/e1000e/ich8lan.c

+3 −1
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state) 
			oem_reg |= HV_OEM_BITS_LPLU;

	}

	/* Restart auto-neg to activate the bits */

	if (!e1000_check_reset_block(hw))

		oem_reg |= HV_OEM_BITS_RESTART_AN;

	ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
@@ -3545,6 +3546,7 @@ struct e1000_info e1000_pch_info = { 
				  | FLAG_HAS_AMT

				  | FLAG_HAS_FLASH

				  | FLAG_HAS_JUMBO_FRAMES

				  | FLAG_DISABLE_FC_PAUSE_TIME /* errata */

				  | FLAG_APME_IN_WUC,

	.pba			= 26,

	.max_hw_frame_size	= 4096,