Commit 7742c0bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (26 commits)
  netdev: i82596 Ethernet needs <asm/cacheflush.h>
  forcedeth: mcp73 device addition
  forcedeth: new device ids in pci_ids.h
  atl1: make atl1_init_ring_ptrs static
  eHEA: net_poll support
  drivers/net/acenic.c: fix check-after-use
  defxx: Use __maybe_unused rather than a local hack
  Fix error checking in Vitesse IRQ config
  ps3: reduce allocation size of rx skb buffers
  atl1: use kernel provided ethernet length constants
  atl1: fix typo in dma_req_block
  atl1: change cmb write threshold
  atl1: fix typo in DMA engine setup
  atl1: change tpd_avail function name
  ps3: fix rare issue that reenabling rx DMA fails
  ps3: removed calling netif_poll_enable() in open()
  ps3: use ethX as the name of irq
  ps3: use net_device_stats of net_device structure
  ps3: removed conditional ethtool support
  ps3: removed defines no longer used
  ...
parents 9e72ea82 88accb49

drivers/net/82596.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <asm/io.h>

#include <asm/dma.h>

#include <asm/pgtable.h>

#include <asm/cacheflush.h>



static char version[] __initdata =

	"82596.c $Revision: 1.5 $\n";

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ gianfar_driver-objs := gianfar.o \ 
		gianfar_sysfs.o



obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o

ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o

ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o



#

# link order important here

drivers/net/acenic.c

+0 −6
Original line number Diff line number Diff line
@@ -3128,12 +3128,6 @@ static int __devinit read_eeprom_byte(struct net_device *dev, 
	int result = 0;

	short i;



	if (!dev) {

		printk(KERN_ERR "No device!\n");

		result = -ENODEV;

		goto out;

	}



	/*

	 * Don't take interrupts on this CPU will bit banging

	 * the %#%#@$ I2C device

drivers/net/atl1/atl1_hw.h

+2 −7
Original line number Diff line number Diff line
@@ -680,11 +680,6 @@ void atl1_check_options(struct atl1_adapter *adapter); 
#define AUTONEG_ADVERTISE_10_100_ALL	0x000F	/* All 10/100 speeds */

#define AUTONEG_ADVERTISE_10_ALL	0x0003	/* 10Mbps Full & Half speeds */



/* The size (in bytes) of a ethernet packet */

#define ENET_HEADER_SIZE		14

#define MAXIMUM_ETHERNET_FRAME_SIZE	1518	/* with FCS */

#define MINIMUM_ETHERNET_FRAME_SIZE	64	/* with FCS */

#define ETHERNET_FCS_SIZE		4

#define MAX_JUMBO_FRAME_SIZE		0x2800



#define PHY_AUTO_NEG_TIME	45	/* 4.5 Seconds */
@@ -929,8 +924,8 @@ enum atl1_dma_req_block { 
	atl1_dma_req_128 = 0,

	atl1_dma_req_256 = 1,

	atl1_dma_req_512 = 2,

	atl1_dam_req_1024 = 3,

	atl1_dam_req_2048 = 4,

	atl1_dma_req_1024 = 3,

	atl1_dma_req_2048 = 4,

	atl1_dma_req_4096 = 5

};

drivers/net/atl1/atl1_main.c

+16 −12
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <linux/skbuff.h>

#include <linux/etherdevice.h>

#include <linux/if_vlan.h>

#include <linux/if_ether.h>

#include <linux/irqreturn.h>

#include <linux/workqueue.h>

#include <linux/timer.h>
@@ -120,8 +121,8 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter) 
	struct atl1_hw *hw = &adapter->hw;

	struct net_device *netdev = adapter->netdev;



	hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;

	hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;

	hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;

	hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;



	adapter->wol = 0;

	adapter->rx_buffer_len = (hw->max_frame_size + 7) & ~7;
@@ -314,7 +315,7 @@ err_nomem: 
	return -ENOMEM;

}



void atl1_init_ring_ptrs(struct atl1_adapter *adapter)

static void atl1_init_ring_ptrs(struct atl1_adapter *adapter)

{

	struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;

	struct atl1_rfd_ring *rfd_ring = &adapter->rfd_ring;
@@ -688,9 +689,9 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu) 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);

	int old_mtu = netdev->mtu;

	int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;



	if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||

	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||

	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {

		dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");

		return -EINVAL;
@@ -908,8 +909,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter) 
	/* config DMA Engine */

	value = ((((u32) hw->dmar_block) & DMA_CTRL_DMAR_BURST_LEN_MASK)

		<< DMA_CTRL_DMAR_BURST_LEN_SHIFT) |

		((((u32) hw->dmaw_block) & DMA_CTRL_DMAR_BURST_LEN_MASK)

		<< DMA_CTRL_DMAR_BURST_LEN_SHIFT) | DMA_CTRL_DMAR_EN |

		((((u32) hw->dmaw_block) & DMA_CTRL_DMAW_BURST_LEN_MASK)

		<< DMA_CTRL_DMAW_BURST_LEN_SHIFT) | DMA_CTRL_DMAR_EN |

		DMA_CTRL_DMAW_EN;

	value |= (u32) hw->dma_ord;

	if (atl1_rcb_128 == hw->rcb_value)
@@ -917,7 +918,10 @@ static u32 atl1_configure(struct atl1_adapter *adapter) 
	iowrite32(value, hw->hw_addr + REG_DMA_CTRL);



	/* config CMB / SMB */

	value = hw->cmb_rrd | ((u32) hw->cmb_tpd << 16);

	value = (hw->cmb_tpd > adapter->tpd_ring.count) ?

		hw->cmb_tpd : adapter->tpd_ring.count;

	value <<= 16;

	value |= hw->cmb_rrd;

	iowrite32(value, hw->hw_addr + REG_CMB_WRITE_TH);

	value = hw->cmb_rx_timer | ((u32) hw->cmb_tx_timer << 16);

	iowrite32(value, hw->hw_addr + REG_CMB_WRITE_TIMER);
@@ -1334,7 +1338,7 @@ rrd_ok: 
		skb = buffer_info->skb;

		length = le16_to_cpu(rrd->xsz.xsum_sz.pkt_size);



		skb_put(skb, length - ETHERNET_FCS_SIZE);

		skb_put(skb, length - ETH_FCS_LEN);



		/* Receive Checksum Offload */

		atl1_rx_checksum(adapter, rrd, skb);
@@ -1422,7 +1426,7 @@ static void atl1_intr_tx(struct atl1_adapter *adapter) 
		netif_wake_queue(adapter->netdev);

}



static u16 tpd_avail(struct atl1_tpd_ring *tpd_ring)

static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)

{

	u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);

	u16 next_to_use = atomic_read(&tpd_ring->next_to_use);
@@ -1453,7 +1457,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb, 
			tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,

				iph->daddr, 0, IPPROTO_TCP, 0);

			ipofst = skb_network_offset(skb);

			if (ipofst != ENET_HEADER_SIZE) /* 802.3 frame */

			if (ipofst != ETH_HLEN) /* 802.3 frame */

				tso->tsopl |= 1 << TSO_PARAM_ETHTYPE_SHIFT;



			tso->tsopl |= (iph->ihl &
@@ -1708,7 +1712,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
		return NETDEV_TX_LOCKED;

	}



	if (tpd_avail(&adapter->tpd_ring) < count) {

	if (atl1_tpd_avail(&adapter->tpd_ring) < count) {

		/* not enough descriptors */

		netif_stop_queue(netdev);

		spin_unlock_irqrestore(&adapter->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE