Commit d3143e71 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:
  Broadcom 4400 resume small fix
  b44: src_desc->addr is little-endian
  e100: fix irq leak on suspend/resume
  bonding: ARP monitoring broken on x86_64
  ehea: Fixed missing tasklet_kill() call
  ehea: Fixed wrong jumbo frames status query
  82596 warning fixes
  FS_ENET: OF-related fixup for FEC and SCC MAC's
  net: ifb error path loop fix
  b44: Fix frequent link changes
parents b20c8453 90afd0e5

drivers/net/82596.c

+4 −3
Original line number Diff line number Diff line
@@ -1066,8 +1066,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	short length = skb->len;

	dev->trans_start = jiffies;



	DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name,

				skb->len, (unsigned int)skb->data));

	DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n",

				dev->name, skb->len, skb->data));



	if (skb->len < ETH_ZLEN) {

		if (skb_padto(skb, ETH_ZLEN))
@@ -1246,7 +1246,8 @@ struct net_device * __init i82596_probe(int unit) 
	dev->priv = (void *)(dev->mem_start);



	lp = dev->priv;

	DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n",

	DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%zd bytes), "

			"lp->scb at 0x%08lx\n",

			dev->name, (unsigned long)lp,

			sizeof(struct i596_private), (unsigned long)&lp->scb));

	memset((void *) lp, 0, sizeof(struct i596_private));

drivers/net/b44.c

+33 −17
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ MODULE_DEVICE_TABLE(pci, b44_pci_tbl); 


static void b44_halt(struct b44 *);

static void b44_init_rings(struct b44 *);



#define B44_FULL_RESET		1

#define B44_FULL_RESET_SKIP_PHY	2

#define B44_PARTIAL_RESET	3



static void b44_init_hw(struct b44 *, int);



static int dma_desc_align_mask;
@@ -884,7 +889,7 @@ static int b44_poll(struct net_device *netdev, int *budget) 
		spin_lock_irqsave(&bp->lock, flags);

		b44_halt(bp);

		b44_init_rings(bp);

		b44_init_hw(bp, 1);

		b44_init_hw(bp, B44_FULL_RESET_SKIP_PHY);

		netif_wake_queue(bp->dev);

		spin_unlock_irqrestore(&bp->lock, flags);

		done = 1;
@@ -954,7 +959,7 @@ static void b44_tx_timeout(struct net_device *dev) 


	b44_halt(bp);

	b44_init_rings(bp);

	b44_init_hw(bp, 1);

	b44_init_hw(bp, B44_FULL_RESET);



	spin_unlock_irq(&bp->lock);
@@ -1071,7 +1076,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu) 
	b44_halt(bp);

	dev->mtu = new_mtu;

	b44_init_rings(bp);

	b44_init_hw(bp, 1);

	b44_init_hw(bp, B44_FULL_RESET);

	spin_unlock_irq(&bp->lock);



	b44_enable_ints(bp);
@@ -1368,12 +1373,12 @@ static int b44_set_mac_addr(struct net_device *dev, void *p) 
 * packet processing.  Invoked with bp->lock held.

 */

static void __b44_set_rx_mode(struct net_device *);

static void b44_init_hw(struct b44 *bp, int full_reset)

static void b44_init_hw(struct b44 *bp, int reset_kind)

{

	u32 val;



	b44_chip_reset(bp);

	if (full_reset) {

	if (reset_kind == B44_FULL_RESET) {

		b44_phy_reset(bp);

		b44_setup_phy(bp);

	}
@@ -1390,7 +1395,10 @@ static void b44_init_hw(struct b44 *bp, int full_reset) 
	bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);



	bw32(bp, B44_TX_WMARK, 56); /* XXX magic */

	if (full_reset) {

	if (reset_kind == B44_PARTIAL_RESET) {

		bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |

				      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));

	} else {

		bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);

		bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);

		bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
@@ -1401,9 +1409,6 @@ static void b44_init_hw(struct b44 *bp, int full_reset) 
		bp->rx_prod = bp->rx_pending;



		bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);

	} else {

		bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |

				      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));

	}



	val = br32(bp, B44_ENET_CTRL);
@@ -1420,7 +1425,7 @@ static int b44_open(struct net_device *dev) 
		goto out;



	b44_init_rings(bp);

	b44_init_hw(bp, 1);

	b44_init_hw(bp, B44_FULL_RESET);



	b44_check_phy(bp);
@@ -1629,7 +1634,7 @@ static int b44_close(struct net_device *dev) 
	netif_poll_enable(dev);



	if (bp->flags & B44_FLAG_WOL_ENABLE) {

		b44_init_hw(bp, 0);

		b44_init_hw(bp, B44_PARTIAL_RESET);

		b44_setup_wol(bp);

	}
@@ -1905,7 +1910,7 @@ static int b44_set_ringparam(struct net_device *dev, 


	b44_halt(bp);

	b44_init_rings(bp);

	b44_init_hw(bp, 1);

	b44_init_hw(bp, B44_FULL_RESET);

	netif_wake_queue(bp->dev);

	spin_unlock_irq(&bp->lock);
@@ -1948,7 +1953,7 @@ static int b44_set_pauseparam(struct net_device *dev, 
	if (bp->flags & B44_FLAG_PAUSE_AUTO) {

		b44_halt(bp);

		b44_init_rings(bp);

		b44_init_hw(bp, 1);

		b44_init_hw(bp, B44_FULL_RESET);

	} else {

		__b44_set_flow_ctrl(bp, bp->flags);

	}
@@ -2304,7 +2309,7 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state) 


	free_irq(dev->irq, dev);

	if (bp->flags & B44_FLAG_WOL_ENABLE) {

		b44_init_hw(bp, 0);

		b44_init_hw(bp, B44_PARTIAL_RESET);

		b44_setup_wol(bp);

	}

	pci_disable_device(pdev);
@@ -2315,21 +2320,32 @@ static int b44_resume(struct pci_dev *pdev) 
{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct b44 *bp = netdev_priv(dev);

	int rc = 0;



	pci_restore_state(pdev);

	pci_enable_device(pdev);

	rc = pci_enable_device(pdev);

	if (rc) {

		printk(KERN_ERR PFX "%s: pci_enable_device failed\n",

			dev->name);

		return rc;

	}



	pci_set_master(pdev);



	if (!netif_running(dev))

		return 0;



	if (request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev))

	rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);

	if (rc) {

		printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);

		pci_disable_device(pdev);

		return rc;

	}



	spin_lock_irq(&bp->lock);



	b44_init_rings(bp);

	b44_init_hw(bp, 1);

	b44_init_hw(bp, B44_FULL_RESET);

	netif_device_attach(bp->dev);

	spin_unlock_irq(&bp->lock);

drivers/net/bonding/bonding.h

+4 −3
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ struct slave { 
	struct slave *next;

	struct slave *prev;

	int    delay;

	u32    jiffies;

	u32    last_arp_rx;

	unsigned long jiffies;

	unsigned long last_arp_rx;

	s8     link;    /* one of BOND_LINK_XXXX */

	s8     state;   /* one of BOND_STATE_XXXX */

	u32    original_flags;
@@ -242,7 +242,8 @@ extern inline int slave_do_arp_validate(struct bonding *bond, struct slave *slav 
	return bond->params.arp_validate & (1 << slave->state);

}



extern inline u32 slave_last_rx(struct bonding *bond, struct slave *slave)

extern inline unsigned long slave_last_rx(struct bonding *bond,

					struct slave *slave)

{

	if (slave_do_arp_validate(bond, slave))

		return slave->last_arp_rx;

drivers/net/e100.c

+2 −0
Original line number Diff line number Diff line
@@ -2725,6 +2725,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) 
	del_timer_sync(&nic->watchdog);

	netif_carrier_off(nic->netdev);



	netif_device_detach(netdev);

	pci_save_state(pdev);



	if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2736,6 +2737,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) 
	}



	pci_disable_device(pdev);

	free_irq(pdev->irq, netdev);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;

drivers/net/ehea/ehea.h

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



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0044"

#define DRV_VERSION	"EHEA_0045"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)

CRA Git | Maintained and supported by SUSTech CRA and CCSE