Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 33 insertions, 14 deletions

diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 3b79a225628a..56387b191c96 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2009 ServerEngines
+ * Copyright (C) 2005 - 2010 ServerEngines
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -29,26 +29,36 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 
 #include "be_hw.h"
 
-#define DRV_VER                 "2.101.205"
+#define DRV_VER                 "2.102.147u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
+#define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
 #define OC_NAME                 "Emulex OneConnect 10Gbps NIC"
-#define DRV_DESC                BE_NAME "Driver"
+#define OC_NAME1                "Emulex OneConnect 10Gbps NIC (be3)"
+#define DRV_DESC                "ServerEngines BladeEngine 10Gbps NIC Driver"
 
 #define BE_VENDOR_ID            0x19a2
 #define BE_DEVICE_ID1           0x211
+#define BE_DEVICE_ID2           0x221
 #define OC_DEVICE_ID1           0x700
-#define OC_DEVICE_ID2           0x701
+#define OC_DEVICE_ID2           0x710
 
 static inline char *nic_name(struct pci_dev *pdev)
 {
-        if (pdev->device == OC_DEVICE_ID1 || pdev->device == OC_DEVICE_ID2)
+        switch (pdev->device) {
+        case OC_DEVICE_ID1:
                 return OC_NAME;
-        else
+        case OC_DEVICE_ID2:
+                return OC_NAME1;
+        case BE_DEVICE_ID2:
+                return BE3_NAME;
+        default:
                 return BE_NAME;
+        }
 }
 
 /* Number of bytes of an RX frame that are copied to skb->data */
@@ -142,6 +152,7 @@ struct be_eq_obj {
 struct be_mcc_obj {
         struct be_queue_info q;
         struct be_queue_info cq;
+        bool rearm_cq;
 };
 
 struct be_drvr_stats {
@@ -154,17 +165,19 @@ struct be_drvr_stats {
         ulong be_tx_jiffies;
         u64 be_tx_bytes;
         u64 be_tx_bytes_prev;
+        u64 be_tx_pkts;
         u32 be_tx_rate;
 
         u32 cache_barrier[16];
 
         u32 be_ethrx_post_fail;/* number of ethrx buffer alloc failures */
-        u32 be_polls;           /* number of times NAPI called poll function */
+        u32 be_rx_polls;        /* number of times NAPI called poll function */
         u32 be_rx_events;       /* number of ucast rx completion events  */
         u32 be_rx_compl;        /* number of rx completion entries processed */
         ulong be_rx_jiffies;
         u64 be_rx_bytes;
         u64 be_rx_bytes_prev;
+        u64 be_rx_pkts;
         u32 be_rx_rate;
         /* number of non ether type II frames dropped where
          * frame len > length field of Mac Hdr */
@@ -181,7 +194,6 @@ struct be_drvr_stats {
 
 struct be_stats_obj {
         struct be_drvr_stats drvr_stats;
-        struct net_device_stats net_stats;
         struct be_dma_mem cmd;
 };
 
@@ -242,8 +254,10 @@ struct be_adapter {
         bool rx_post_starved;   /* Zero rx frags have been posted to BE */
 
         struct vlan_group *vlan_grp;
-        u16 num_vlans;
+        u16 vlans_added;
+        u16 max_vlans;  /* Number of vlans supported */
         u8 vlan_tag[VLAN_GROUP_ARRAY_LEN];
+        struct be_dma_mem mc_cmd_mem;
 
         struct be_stats_obj stats;
         /* Work queue used to perform periodic tasks like getting statistics */
@@ -255,23 +269,28 @@ struct be_adapter {
         u32 if_handle;          /* Used to configure filtering */
         u32 pmac_id;            /* MAC addr handle used by BE card */
 
+        bool eeh_err;
         bool link_up;
         u32 port_num;
         bool promiscuous;
+        bool wol;
         u32 cap;
         u32 rx_fc;              /* Rx flow control */
         u32 tx_fc;              /* Tx flow control */
+        int link_speed;
+        u8 port_type;
+        u8 transceiver;
+        u8 generation;          /* BladeEngine ASIC generation */
 };
 
+/* BladeEngine Generation numbers */
+#define BE_GEN2 2
+#define BE_GEN3 3
+
 extern const struct ethtool_ops be_ethtool_ops;
 
 #define drvr_stats(adapter)             (&adapter->stats.drvr_stats)
 
-static inline unsigned int be_pci_func(struct be_adapter *adapter)
-{
-        return PCI_FUNC(adapter->pdev->devfn);
-}
-
 #define BE_SET_NETDEV_OPS(netdev, ops)  (netdev->netdev_ops = ops)
 
 #define PAGE_SHIFT_4K           12