From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2009 22:54:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=13220a94d35708d5378114e96ffcc88d0a74fe99;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits)
  ixgbe: Allow Priority Flow Control settings to survive a device reset
  net: core: remove unneeded include in net/core/utils.c.
  e1000e: update version number
  e1000e: fix close interrupt race
  e1000e: fix loss of multicast packets
  e1000e: commonize tx cleanup routine to match e1000 & igb
  netfilter: fix nf_logger name in ebt_ulog.
  netfilter: fix warning in ebt_ulog init function.
  netfilter: fix warning about invalid const usage
  e1000: fix close race with interrupt
  e1000: cleanup clean_tx_irq routine so that it completely cleans ring
  e1000: fix tx hang detect logic and address dma mapping issues
  bridge: bad error handling when adding invalid ether address
  bonding: select current active slave when enslaving device for mode tlb and alb
  gianfar: reallocate skb when headroom is not enough for fcb
  Bump release date to 25Mar2009 and version to 0.22
  r6040: Fix second PHY address
  qeth: fix wait_event_timeout handling
  qeth: check for completion of a running recovery
  qeth: unregister MAC addresses during recovery.
  ...

Manually fixed up conflicts in:
	drivers/infiniband/hw/cxgb3/cxio_hal.h
	drivers/infiniband/hw/nes/nes_nic.c
---

13220a94d35708d5378114e96ffcc88d0a74fe99
diff --cc drivers/infiniband/hw/cxgb3/cxio_hal.h
index e44dc228947,9ed65b05517..094a66d1480
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.h
@@@ -110,7 -108,8 +110,9 @@@ struct cxio_rdev 
  	struct gen_pool *pbl_pool;
  	struct gen_pool *rqt_pool;
  	struct list_head entry;
 +	struct ch_embedded_info fw_info;
+ 	u32	flags;
+ #define	CXIO_ERROR_FATAL	1
  };
  
  static inline int cxio_num_stags(struct cxio_rdev *rdev_p)
diff --cc drivers/infiniband/hw/nes/nes_nic.c
index 025ed9f7d9c,ae8c6888b53..8d3e4c6f237
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@@ -1559,7 -1589,7 +1572,7 @@@ struct net_device *nes_netdev_init(stru
  		void __iomem *mmio_addr)
  {
  	u64 u64temp;
--	struct nes_vnic *nesvnic = NULL;
++	struct nes_vnic *nesvnic;
  	struct net_device *netdev;
  	struct nic_qp_map *curr_qp_map;
  	u32 u32temp;
@@@ -1571,6 -1601,6 +1584,7 @@@
  		printk(KERN_ERR PFX "nesvnic etherdev alloc failed");
  		return NULL;
  	}
++	nesvnic = netdev_priv(netdev);
  
  	nes_debug(NES_DBG_INIT, "netdev = %p, %s\n", netdev, netdev->name);
  
@@@ -1598,9 -1618,10 +1602,10 @@@
  	netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
  	nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
  	netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
 +	netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
+ 	netdev->features |= NETIF_F_LLTX;
  
  	/* Fill in the port structure */
 -	nesvnic = netdev_priv(netdev);
  	nesvnic->netdev = netdev;
  	nesvnic->nesdev = nesdev;
  	nesvnic->msg_enable = netif_msg_init(debug, default_msg);