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: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

6 files changed, 139 insertions, 105 deletions

diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/cxgb4/cxgb4.h
index 3d8ff4889b56..dd1770e075e6 100644
--- a/drivers/net/cxgb4/cxgb4.h
+++ b/drivers/net/cxgb4/cxgb4.h
@@ -53,7 +53,7 @@
 
 enum {
         MAX_NPORTS = 4,     /* max # of ports */
-        SERNUM_LEN = 16,    /* Serial # length */
+        SERNUM_LEN = 24,    /* Serial # length */
         EC_LEN     = 16,    /* E/C length */
         ID_LEN     = 16,    /* ID length */
 };
@@ -477,7 +477,6 @@ struct adapter {
         struct pci_dev *pdev;
         struct device *pdev_dev;
         unsigned long registered_device_map;
-        unsigned long open_device_map;
         unsigned long flags;
 
         const char *name;
@@ -651,14 +650,11 @@ int t4_link_start(struct adapter *adap, unsigned int mbox, unsigned int port,
                   struct link_config *lc);
 int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port);
 int t4_seeprom_wp(struct adapter *adapter, bool enable);
-int t4_read_flash(struct adapter *adapter, unsigned int addr,
-                  unsigned int nwords, u32 *data, int byte_oriented);
 int t4_load_fw(struct adapter *adapter, const u8 *fw_data, unsigned int size);
 int t4_check_fw_version(struct adapter *adapter);
 int t4_prep_adapter(struct adapter *adapter);
 int t4_port_init(struct adapter *adap, int mbox, int pf, int vf);
 void t4_fatal_err(struct adapter *adapter);
-void t4_set_vlan_accel(struct adapter *adapter, unsigned int ports, int on);
 int t4_set_trace_filter(struct adapter *adapter, const struct trace_params *tp,
                         int filter_index, int enable);
 void t4_get_trace_filter(struct adapter *adapter, struct trace_params *tp,
@@ -709,7 +705,8 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port,
 int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,
                unsigned int vf, unsigned int viid);
 int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,
-                int mtu, int promisc, int all_multi, int bcast, bool sleep_ok);
+                int mtu, int promisc, int all_multi, int bcast, int vlanex,
+                bool sleep_ok);
 int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox,
                       unsigned int viid, bool free, unsigned int naddr,
                       const u8 **addr, u16 *idx, u64 *hash, bool sleep_ok);
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index a7e30a23d322..58045b00cf40 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -240,9 +240,9 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)
         u16 filt_idx[7];
         const u8 *addr[7];
         int ret, naddr = 0;
-        const struct dev_addr_list *d;
         const struct netdev_hw_addr *ha;
         int uc_cnt = netdev_uc_count(dev);
+        int mc_cnt = netdev_mc_count(dev);
         const struct port_info *pi = netdev_priv(dev);
 
         /* first do the secondary unicast addresses */
@@ -260,9 +260,9 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)
         }
 
         /* next set up the multicast addresses */
-        netdev_for_each_mc_addr(d, dev) {
-                addr[naddr++] = d->dmi_addr;
-                if (naddr >= ARRAY_SIZE(addr) || d->next == NULL) {
+        netdev_for_each_mc_addr(ha, dev) {
+                addr[naddr++] = ha->addr;
+                if (--mc_cnt == 0 || naddr >= ARRAY_SIZE(addr)) {
                         ret = t4_alloc_mac_filt(pi->adapter, 0, pi->viid, free,
                                         naddr, addr, filt_idx, &mhash, sleep);
                         if (ret < 0)
@@ -290,7 +290,7 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)
         if (ret == 0)
                 ret = t4_set_rxmode(pi->adapter, 0, pi->viid, mtu,
                                     (dev->flags & IFF_PROMISC) ? 1 : 0,
-                                    (dev->flags & IFF_ALLMULTI) ? 1 : 0, 1,
+                                    (dev->flags & IFF_ALLMULTI) ? 1 : 0, 1, -1,
                                     sleep_ok);
         return ret;
 }
@@ -311,11 +311,11 @@ static int link_start(struct net_device *dev)
          * that step explicitly.
          */
         ret = t4_set_rxmode(pi->adapter, 0, pi->viid, dev->mtu, -1, -1, -1,
-                            true);
+                            pi->vlan_grp != NULL, true);
         if (ret == 0) {
                 ret = t4_change_mac(pi->adapter, 0, pi->viid,
                                     pi->xact_addr_filt, dev->dev_addr, true,
-                                    false);
+                                    true);
                 if (ret >= 0) {
                         pi->xact_addr_filt = ret;
                         ret = 0;
@@ -859,6 +859,8 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
         "RxCsumGood         ",
         "VLANextractions    ",
         "VLANinsertions     ",
+        "GROpackets         ",
+        "GROmerged          ",
 };
 
 static int get_sset_count(struct net_device *dev, int sset)
@@ -922,6 +924,8 @@ struct queue_port_stats {
         u64 rx_csum;
         u64 vlan_ex;
         u64 vlan_ins;
+        u64 gro_pkts;
+        u64 gro_merged;
 };
 
 static void collect_sge_port_stats(const struct adapter *adap,
@@ -938,6 +942,8 @@ static void collect_sge_port_stats(const struct adapter *adap,
                 s->rx_csum += rx->stats.rx_cso;
                 s->vlan_ex += rx->stats.vlan_ex;
                 s->vlan_ins += tx->vlan_ins;
+                s->gro_pkts += rx->stats.lro_pkts;
+                s->gro_merged += rx->stats.lro_merged;
         }
 }
 
@@ -1711,6 +1717,18 @@ static int set_tso(struct net_device *dev, u32 value)
         return 0;
 }
 
+static int set_flags(struct net_device *dev, u32 flags)
+{
+        if (flags & ~ETH_FLAG_RXHASH)
+                return -EOPNOTSUPP;
+
+        if (flags & ETH_FLAG_RXHASH)
+                dev->features |= NETIF_F_RXHASH;
+        else
+                dev->features &= ~NETIF_F_RXHASH;
+        return 0;
+}
+
 static struct ethtool_ops cxgb_ethtool_ops = {
         .get_settings      = get_settings,
         .set_settings      = set_settings,
@@ -1741,6 +1759,7 @@ static struct ethtool_ops cxgb_ethtool_ops = {
         .get_wol           = get_wol,
         .set_wol           = set_wol,
         .set_tso           = set_tso,
+        .set_flags         = set_flags,
         .flash_device      = set_flash,
 };
 
@@ -2308,6 +2327,9 @@ static void uld_attach(struct adapter *adap, unsigned int uld)
                 register_netevent_notifier(&cxgb4_netevent_nb);
                 netevent_registered = true;
         }
+
+        if (adap->flags & FULL_INIT_DONE)
+                ulds[uld].state_change(handle, CXGB4_STATE_UP);
 }
 
 static void attach_ulds(struct adapter *adap)
@@ -2414,23 +2436,17 @@ EXPORT_SYMBOL(cxgb4_unregister_uld);
  */
 static int cxgb_up(struct adapter *adap)
 {
-        int err = 0;
+        int err;
 
-        if (!(adap->flags & FULL_INIT_DONE)) {
-                err = setup_sge_queues(adap);
-                if (err)
-                        goto out;
-                err = setup_rss(adap);
-                if (err) {
-                        t4_free_sge_resources(adap);
-                        goto out;
-                }
-                if (adap->flags & USING_MSIX)
-                        name_msix_vecs(adap);
-                adap->flags |= FULL_INIT_DONE;
-        }
+        err = setup_sge_queues(adap);
+        if (err)
+                goto out;
+        err = setup_rss(adap);
+        if (err)
+                goto freeq;
 
         if (adap->flags & USING_MSIX) {
+                name_msix_vecs(adap);
                 err = request_irq(adap->msix_info[0].vec, t4_nondata_intr, 0,
                                   adap->msix_info[0].desc, adap);
                 if (err)
@@ -2451,11 +2467,14 @@ static int cxgb_up(struct adapter *adap)
         enable_rx(adap);
         t4_sge_start(adap);
         t4_intr_enable(adap);
+        adap->flags |= FULL_INIT_DONE;
         notify_ulds(adap, CXGB4_STATE_UP);
  out:
         return err;
  irq_err:
         dev_err(adap->pdev_dev, "request_irq failed, err %d\n", err);
+ freeq:
+        t4_free_sge_resources(adap);
         goto out;
 }
 
@@ -2471,6 +2490,9 @@ static void cxgb_down(struct adapter *adapter)
         } else
                 free_irq(adapter->pdev->irq, adapter);
         quiesce_rx(adapter);
+        t4_sge_stop(adapter);
+        t4_free_sge_resources(adapter);
+        adapter->flags &= ~FULL_INIT_DONE;
 }
 
 /*
@@ -2482,11 +2504,13 @@ static int cxgb_open(struct net_device *dev)
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
 
-        if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
-                return err;
+        if (!(adapter->flags & FULL_INIT_DONE)) {
+                err = cxgb_up(adapter);
+                if (err < 0)
+                        return err;
+        }
 
         dev->real_num_tx_queues = pi->nqsets;
-        set_bit(pi->tx_chan, &adapter->open_device_map);
         link_start(dev);
         netif_tx_start_all_queues(dev);
         return 0;
@@ -2494,19 +2518,12 @@ static int cxgb_open(struct net_device *dev)
 
 static int cxgb_close(struct net_device *dev)
 {
-        int ret;
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
 
         netif_tx_stop_all_queues(dev);
         netif_carrier_off(dev);
-        ret = t4_enable_vi(adapter, 0, pi->viid, false, false);
-
-        clear_bit(pi->tx_chan, &adapter->open_device_map);
-
-        if (!adapter->open_device_map)
-                cxgb_down(adapter);
-        return 0;
+        return t4_enable_vi(adapter, 0, pi->viid, false, false);
 }
 
 static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
@@ -2601,7 +2618,7 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 
         if (new_mtu < 81 || new_mtu > MAX_MTU)         /* accommodate SACK */
                 return -EINVAL;
-        ret = t4_set_rxmode(pi->adapter, 0, pi->viid, new_mtu, -1, -1, -1,
+        ret = t4_set_rxmode(pi->adapter, 0, pi->viid, new_mtu, -1, -1, -1, -1,
                             true);
         if (!ret)
                 dev->mtu = new_mtu;
@@ -2632,7 +2649,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
         struct port_info *pi = netdev_priv(dev);
 
         pi->vlan_grp = grp;
-        t4_set_vlan_accel(pi->adapter, 1 << pi->tx_chan, grp != NULL);
+        t4_set_rxmode(pi->adapter, 0, pi->viid, -1, -1, -1, -1, grp != NULL,
+                      true);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -3066,6 +3084,12 @@ static void __devinit print_port_info(struct adapter *adap)
 
         int i;
         char buf[80];
+        const char *spd = "";
+
+        if (adap->params.pci.speed == PCI_EXP_LNKSTA_CLS_2_5GB)
+                spd = " 2.5 GT/s";
+        else if (adap->params.pci.speed == PCI_EXP_LNKSTA_CLS_5_0GB)
+                spd = " 5 GT/s";
 
         for_each_port(adap, i) {
                 struct net_device *dev = adap->port[i];
@@ -3085,10 +3109,10 @@ static void __devinit print_port_info(struct adapter *adap)
                         --bufp;
                 sprintf(bufp, "BASE-%s", base[pi->port_type]);
 
-                netdev_info(dev, "Chelsio %s rev %d %s %sNIC PCIe x%d%s\n",
+                netdev_info(dev, "Chelsio %s rev %d %s %sNIC PCIe x%d%s%s\n",
                             adap->params.vpd.id, adap->params.rev,
                             buf, is_offload(adap) ? "R" : "",
-                            adap->params.pci.width,
+                            adap->params.pci.width, spd,
                             (adap->flags & USING_MSIX) ? " MSI-X" :
                             (adap->flags & USING_MSI) ? " MSI" : "");
                 if (adap->name == dev->name)
@@ -3203,7 +3227,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
                 netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6;
                 netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
-                netdev->features |= NETIF_F_GRO | highdma;
+                netdev->features |= NETIF_F_GRO | NETIF_F_RXHASH | highdma;
                 netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
                 netdev->vlan_features = netdev->features & VLAN_FEAT;
 
@@ -3334,8 +3358,8 @@ static void __devexit remove_one(struct pci_dev *pdev)
                 if (adapter->debugfs_root)
                         debugfs_remove_recursive(adapter->debugfs_root);
 
-                t4_sge_stop(adapter);
-                t4_free_sge_resources(adapter);
+                if (adapter->flags & FULL_INIT_DONE)
+                        cxgb_down(adapter);
                 t4_free_mem(adapter->l2t);
                 t4_free_mem(adapter->tids.tid_tab);
                 disable_msi(adapter);
diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/cxgb4/sge.c
index 14adc58e71c3..d1f8f225e45a 100644
--- a/drivers/net/cxgb4/sge.c
+++ b/drivers/net/cxgb4/sge.c
@@ -1471,7 +1471,7 @@ EXPORT_SYMBOL(cxgb4_pktgl_to_skb);
  *      Releases the pages of a packet gather list.  We do not own the last
  *      page on the list and do not free it.
  */
-void t4_pktgl_free(const struct pkt_gl *gl)
+static void t4_pktgl_free(const struct pkt_gl *gl)
 {
         int n;
         const skb_frag_t *p;
@@ -1524,6 +1524,8 @@ static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl,
         skb->truesize += skb->data_len;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
         skb_record_rx_queue(skb, rxq->rspq.idx);
+        if (rxq->rspq.netdev->features & NETIF_F_RXHASH)
+                skb->rxhash = (__force u32)pkt->rsshdr.hash_val;
 
         if (unlikely(pkt->vlan_ex)) {
                 struct port_info *pi = netdev_priv(rxq->rspq.netdev);
@@ -1565,7 +1567,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
         if (unlikely(*(u8 *)rsp == CPL_TRACE_PKT))
                 return handle_trace_pkt(q->adap, si);
 
-        pkt = (void *)&rsp[1];
+        pkt = (const struct cpl_rx_pkt *)rsp;
         csum_ok = pkt->csum_calc && !pkt->err_vec;
         if ((pkt->l2info & htonl(RXF_TCP)) &&
             (q->netdev->features & NETIF_F_GRO) && csum_ok && !pkt->ip_frag) {
@@ -1583,6 +1585,9 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
         __skb_pull(skb, RX_PKT_PAD);      /* remove ethernet header padding */
         skb->protocol = eth_type_trans(skb, q->netdev);
         skb_record_rx_queue(skb, q->idx);
+        if (skb->dev->features & NETIF_F_RXHASH)
+                skb->rxhash = (__force u32)pkt->rsshdr.hash_val;
+
         pi = netdev_priv(skb->dev);
         rxq->stats.pkts++;
 
@@ -2047,7 +2052,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
         adap->sge.ingr_map[iq->cntxt_id] = iq;
 
         if (fl) {
-                fl->cntxt_id = htons(c.fl0id);
+                fl->cntxt_id = ntohs(c.fl0id);
                 fl->avail = fl->pend_cred = 0;
                 fl->pidx = fl->cidx = 0;
                 fl->alloc_failed = fl->large_alloc_failed = fl->starving = 0;
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index a814a3afe123..da272a98fdbc 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -53,8 +53,8 @@
  *      at the time it indicated completion is stored there.  Returns 0 if the
  *      operation completes and -EAGAIN otherwise.
  */
-int t4_wait_op_done_val(struct adapter *adapter, int reg, u32 mask,
-                        int polarity, int attempts, int delay, u32 *valp)
+static int t4_wait_op_done_val(struct adapter *adapter, int reg, u32 mask,
+                               int polarity, int attempts, int delay, u32 *valp)
 {
         while (1) {
                 u32 val = t4_read_reg(adapter, reg);
@@ -109,9 +109,9 @@ void t4_set_reg_field(struct adapter *adapter, unsigned int addr, u32 mask,
  *      Reads registers that are accessed indirectly through an address/data
  *      register pair.
  */
-void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
-                      unsigned int data_reg, u32 *vals, unsigned int nregs,
-                      unsigned int start_idx)
+static void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
+                             unsigned int data_reg, u32 *vals,
+                             unsigned int nregs, unsigned int start_idx)
 {
         while (nregs--) {
                 t4_write_reg(adap, addr_reg, start_idx);
@@ -120,6 +120,7 @@ void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
         }
 }
 
+#if 0
 /**
  *      t4_write_indirect - write indirectly addressed registers
  *      @adap: the adapter
@@ -132,15 +133,16 @@ void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
  *      Writes a sequential block of registers that are accessed indirectly
  *      through an address/data register pair.
  */
-void t4_write_indirect(struct adapter *adap, unsigned int addr_reg,
-                       unsigned int data_reg, const u32 *vals,
-                       unsigned int nregs, unsigned int start_idx)
+static void t4_write_indirect(struct adapter *adap, unsigned int addr_reg,
+                              unsigned int data_reg, const u32 *vals,
+                              unsigned int nregs, unsigned int start_idx)
 {
         while (nregs--) {
                 t4_write_reg(adap, addr_reg, start_idx++);
                 t4_write_reg(adap, data_reg, *vals++);
         }
 }
+#endif
 
 /*
  * Get the reply to a mailbox command and store it in @rpl in big-endian order.
@@ -345,33 +347,21 @@ int t4_edc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
         return 0;
 }
 
-#define VPD_ENTRY(name, len) \
-        u8 name##_kword[2]; u8 name##_len; u8 name##_data[len]
-
 /*
  * Partial EEPROM Vital Product Data structure.  Includes only the ID and
- * VPD-R sections.
+ * VPD-R header.
  */
-struct t4_vpd {
+struct t4_vpd_hdr {
         u8  id_tag;
         u8  id_len[2];
         u8  id_data[ID_LEN];
         u8  vpdr_tag;
         u8  vpdr_len[2];
-        VPD_ENTRY(pn, 16);                     /* part number */
-        VPD_ENTRY(ec, EC_LEN);                 /* EC level */
-        VPD_ENTRY(sn, SERNUM_LEN);             /* serial number */
-        VPD_ENTRY(na, 12);                     /* MAC address base */
-        VPD_ENTRY(port_type, 8);               /* port types */
-        VPD_ENTRY(gpio, 14);                   /* GPIO usage */
-        VPD_ENTRY(cclk, 6);                    /* core clock */
-        VPD_ENTRY(port_addr, 8);               /* port MDIO addresses */
-        VPD_ENTRY(rv, 1);                      /* csum */
-        u32 pad;                  /* for multiple-of-4 sizing and alignment */
 };
 
 #define EEPROM_STAT_ADDR   0x7bfc
 #define VPD_BASE           0
+#define VPD_LEN            512
 
 /**
  *      t4_seeprom_wp - enable/disable EEPROM write protection
@@ -396,16 +386,36 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable)
  */
 static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
 {
-        int ret;
-        struct t4_vpd vpd;
-        u8 *q = (u8 *)&vpd, csum;
+        int i, ret;
+        int ec, sn, v2;
+        u8 vpd[VPD_LEN], csum;
+        unsigned int vpdr_len;
+        const struct t4_vpd_hdr *v;
 
-        ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), &vpd);
+        ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
         if (ret < 0)
                 return ret;
 
-        for (csum = 0; q <= vpd.rv_data; q++)
-                csum += *q;
+        v = (const struct t4_vpd_hdr *)vpd;
+        vpdr_len = pci_vpd_lrdt_size(&v->vpdr_tag);
+        if (vpdr_len + sizeof(struct t4_vpd_hdr) > VPD_LEN) {
+                dev_err(adapter->pdev_dev, "bad VPD-R length %u\n", vpdr_len);
+                return -EINVAL;
+        }
+
+#define FIND_VPD_KW(var, name) do { \
+        var = pci_vpd_find_info_keyword(&v->id_tag, sizeof(struct t4_vpd_hdr), \
+                                        vpdr_len, name); \
+        if (var < 0) { \
+                dev_err(adapter->pdev_dev, "missing VPD keyword " name "\n"); \
+                return -EINVAL; \
+        } \
+        var += PCI_VPD_INFO_FLD_HDR_SIZE; \
+} while (0)
+
+        FIND_VPD_KW(i, "RV");
+        for (csum = 0; i >= 0; i--)
+                csum += vpd[i];
 
         if (csum) {
                 dev_err(adapter->pdev_dev,
@@ -413,12 +423,18 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
                 return -EINVAL;
         }
 
-        p->cclk = simple_strtoul(vpd.cclk_data, NULL, 10);
-        memcpy(p->id, vpd.id_data, sizeof(vpd.id_data));
+        FIND_VPD_KW(ec, "EC");
+        FIND_VPD_KW(sn, "SN");
+        FIND_VPD_KW(v2, "V2");
+#undef FIND_VPD_KW
+
+        p->cclk = simple_strtoul(vpd + v2, NULL, 10);
+        memcpy(p->id, v->id_data, ID_LEN);
         strim(p->id);
-        memcpy(p->ec, vpd.ec_data, sizeof(vpd.ec_data));
+        memcpy(p->ec, vpd + ec, EC_LEN);
         strim(p->ec);
-        memcpy(p->sn, vpd.sn_data, sizeof(vpd.sn_data));
+        i = pci_vpd_info_field_size(vpd + sn - PCI_VPD_INFO_FLD_HDR_SIZE);
+        memcpy(p->sn, vpd + sn, min(i, SERNUM_LEN));
         strim(p->sn);
         return 0;
 }
@@ -537,8 +553,8 @@ static int flash_wait_op(struct adapter *adapter, int attempts, int delay)
  *      (i.e., big-endian), otherwise as 32-bit words in the platform's
  *      natural endianess.
  */
-int t4_read_flash(struct adapter *adapter, unsigned int addr,
-                  unsigned int nwords, u32 *data, int byte_oriented)
+static int t4_read_flash(struct adapter *adapter, unsigned int addr,
+                         unsigned int nwords, u32 *data, int byte_oriented)
 {
         int ret;
 
@@ -870,22 +886,6 @@ int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port)
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
-/**
- *      t4_set_vlan_accel - configure HW VLAN extraction
- *      @adap: the adapter
- *      @ports: bitmap of adapter ports to operate on
- *      @on: enable (1) or disable (0) HW VLAN extraction
- *
- *      Enables or disables HW extraction of VLAN tags for the ports specified
- *      by @ports.  @ports is a bitmap with the ith bit designating the port
- *      associated with the ith adapter channel.
- */
-void t4_set_vlan_accel(struct adapter *adap, unsigned int ports, int on)
-{
-        ports <<= VLANEXTENABLE_SHIFT;
-        t4_set_reg_field(adap, TP_OUT_CONFIG, ports, on ? ports : 0);
-}
-
 struct intr_info {
         unsigned int mask;       /* bits to check in interrupt status */
         const char *msg;         /* message to print or NULL */
@@ -2608,12 +2608,14 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,
  *      @promisc: 1 to enable promiscuous mode, 0 to disable it, -1 no change
  *      @all_multi: 1 to enable all-multi mode, 0 to disable it, -1 no change
  *      @bcast: 1 to enable broadcast Rx, 0 to disable it, -1 no change
+ *      @vlanex: 1 to enable HW VLAN extraction, 0 to disable it, -1 no change
  *      @sleep_ok: if true we may sleep while awaiting command completion
  *
  *      Sets Rx properties of a virtual interface.
  */
 int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,
-                  int mtu, int promisc, int all_multi, int bcast, bool sleep_ok)
+                  int mtu, int promisc, int all_multi, int bcast, int vlanex,
+                  bool sleep_ok)
 {
         struct fw_vi_rxmode_cmd c;
 
@@ -2626,15 +2628,18 @@ int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,
                 all_multi = FW_VI_RXMODE_CMD_ALLMULTIEN_MASK;
         if (bcast < 0)
                 bcast = FW_VI_RXMODE_CMD_BROADCASTEN_MASK;
+        if (vlanex < 0)
+                vlanex = FW_VI_RXMODE_CMD_VLANEXEN_MASK;
 
         memset(&c, 0, sizeof(c));
         c.op_to_viid = htonl(FW_CMD_OP(FW_VI_RXMODE_CMD) | FW_CMD_REQUEST |
                              FW_CMD_WRITE | FW_VI_RXMODE_CMD_VIID(viid));
         c.retval_len16 = htonl(FW_LEN16(c));
-        c.mtu_to_broadcasten = htonl(FW_VI_RXMODE_CMD_MTU(mtu) |
-                                     FW_VI_RXMODE_CMD_PROMISCEN(promisc) |
-                                     FW_VI_RXMODE_CMD_ALLMULTIEN(all_multi) |
-                                     FW_VI_RXMODE_CMD_BROADCASTEN(bcast));
+        c.mtu_to_vlanexen = htonl(FW_VI_RXMODE_CMD_MTU(mtu) |
+                                  FW_VI_RXMODE_CMD_PROMISCEN(promisc) |
+                                  FW_VI_RXMODE_CMD_ALLMULTIEN(all_multi) |
+                                  FW_VI_RXMODE_CMD_BROADCASTEN(bcast) |
+                                  FW_VI_RXMODE_CMD_VLANEXEN(vlanex));
         return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok);
 }
 
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/cxgb4/t4_msg.h
index fdb117443144..7a981b81afaf 100644
--- a/drivers/net/cxgb4/t4_msg.h
+++ b/drivers/net/cxgb4/t4_msg.h
@@ -503,6 +503,7 @@ struct cpl_rx_data_ack {
 };
 
 struct cpl_rx_pkt {
+        struct rss_header rsshdr;
         u8 opcode;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
         u8 iff:4;
diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/cxgb4/t4fw_api.h
index 3393d05a388a..63991d68950e 100644
--- a/drivers/net/cxgb4/t4fw_api.h
+++ b/drivers/net/cxgb4/t4fw_api.h
@@ -876,7 +876,7 @@ struct fw_vi_mac_cmd {
 struct fw_vi_rxmode_cmd {
         __be32 op_to_viid;
         __be32 retval_len16;
-        __be32 mtu_to_broadcasten;
+        __be32 mtu_to_vlanexen;
         __be32 r4_lo;
 };
 
@@ -888,6 +888,8 @@ struct fw_vi_rxmode_cmd {
 #define FW_VI_RXMODE_CMD_ALLMULTIEN(x) ((x) << 12)
 #define FW_VI_RXMODE_CMD_BROADCASTEN_MASK 0x3
 #define FW_VI_RXMODE_CMD_BROADCASTEN(x) ((x) << 10)
+#define FW_VI_RXMODE_CMD_VLANEXEN_MASK 0x3
+#define FW_VI_RXMODE_CMD_VLANEXEN(x) ((x) << 8)
 
 struct fw_vi_enable_cmd {
         __be32 op_to_viid;