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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

1 files changed, 32 insertions, 16 deletions

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 401bebf59502..32763b2dd73f 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -159,16 +159,15 @@ vxge_hw_vpath_fw_api(struct __vxge_hw_virtualpath *vpath, u32 action,
                      u32 fw_memo, u32 offset, u64 *data0, u64 *data1,
                      u64 *steer_ctrl)
 {
-        struct vxge_hw_vpath_reg __iomem *vp_reg;
+        struct vxge_hw_vpath_reg __iomem *vp_reg = vpath->vp_reg;
         enum vxge_hw_status status;
         u64 val64;
-        u32 retry = 0, max_retry = 100;
-
-        vp_reg = vpath->vp_reg;
+        u32 retry = 0, max_retry = 3;
 
-        if (vpath->vp_open) {
-                max_retry = 3;
-                spin_lock(&vpath->lock);
+        spin_lock(&vpath->lock);
+        if (!vpath->vp_open) {
+                spin_unlock(&vpath->lock);
+                max_retry = 100;
         }
 
         writeq(*data0, &vp_reg->rts_access_steer_data0);
@@ -1000,7 +999,7 @@ exit:
 /**
  * vxge_hw_device_hw_info_get - Get the hw information
  * Returns the vpath mask that has the bits set for each vpath allocated
- * for the driver, FW version information and the first mac addresse for
+ * for the driver, FW version information, and the first mac address for
  * each vpath
  */
 enum vxge_hw_status __devinit
@@ -1064,9 +1063,10 @@ vxge_hw_device_hw_info_get(void __iomem *bar0,
 
                 val64 = readq(&toc->toc_vpath_pointer[i]);
 
+                spin_lock_init(&vpath.lock);
                 vpath.vp_reg = (struct vxge_hw_vpath_reg __iomem *)
                                (bar0 + val64);
-                vpath.vp_open = 0;
+                vpath.vp_open = VXGE_HW_VP_NOT_OPEN;
 
                 status = __vxge_hw_vpath_pci_func_mode_get(&vpath, hw_info);
                 if (status != VXGE_HW_OK)
@@ -1090,7 +1090,7 @@ vxge_hw_device_hw_info_get(void __iomem *bar0,
                 val64 = readq(&toc->toc_vpath_pointer[i]);
                 vpath.vp_reg = (struct vxge_hw_vpath_reg __iomem *)
                                (bar0 + val64);
-                vpath.vp_open = 0;
+                vpath.vp_open = VXGE_HW_VP_NOT_OPEN;
 
                 status =  __vxge_hw_vpath_addr_get(&vpath,
                                 hw_info->mac_addrs[i],
@@ -4646,7 +4646,27 @@ static void __vxge_hw_vp_terminate(struct __vxge_hw_device *hldev, u32 vp_id)
                 vpath->hldev->tim_int_mask1, vpath->vp_id);
         hldev->stats.hw_dev_info_stats.vpath_info[vpath->vp_id] = NULL;
 
-        memset(vpath, 0, sizeof(struct __vxge_hw_virtualpath));
+        /* If the whole struct __vxge_hw_virtualpath is zeroed, nothing will
+         * work after the interface is brought down.
+         */
+        spin_lock(&vpath->lock);
+        vpath->vp_open = VXGE_HW_VP_NOT_OPEN;
+        spin_unlock(&vpath->lock);
+
+        vpath->vpmgmt_reg = NULL;
+        vpath->nofl_db = NULL;
+        vpath->max_mtu = 0;
+        vpath->vsport_number = 0;
+        vpath->max_kdfc_db = 0;
+        vpath->max_nofl_db = 0;
+        vpath->ringh = NULL;
+        vpath->fifoh = NULL;
+        memset(&vpath->vpath_handles, 0, sizeof(struct list_head));
+        vpath->stats_block = 0;
+        vpath->hw_stats = NULL;
+        vpath->hw_stats_sav = NULL;
+        vpath->sw_stats = NULL;
+
 exit:
         return;
 }
@@ -4670,7 +4690,7 @@ __vxge_hw_vp_initialize(struct __vxge_hw_device *hldev, u32 vp_id,
 
         vpath = &hldev->virtual_paths[vp_id];
 
-        spin_lock_init(&hldev->virtual_paths[vp_id].lock);
+        spin_lock_init(&vpath->lock);
         vpath->vp_id = vp_id;
         vpath->vp_open = VXGE_HW_VP_OPEN;
         vpath->hldev = hldev;
@@ -5019,10 +5039,6 @@ enum vxge_hw_status vxge_hw_vpath_close(struct __vxge_hw_vpath_handle *vp)
 
         __vxge_hw_vp_terminate(devh, vp_id);
 
-        spin_lock(&vpath->lock);
-        vpath->vp_open = VXGE_HW_VP_NOT_OPEN;
-        spin_unlock(&vpath->lock);
-
 vpath_close_exit:
         return status;
 }