]> Pileus Git - ~andy/linux/blobdiff - drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
hlist: drop the node parameter from iterators
[~andy/linux] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_io.c
index 09aa310b619475a82c6dffc81752f8584ff9ddee..0e630061bff31b41192d4b8fc7978e2be839e274 100644 (file)
@@ -1,3 +1,10 @@
+/*
+ * QLogic qlcnic NIC Driver
+ * Copyright (c) 2009-2013 QLogic Corporation
+ *
+ * See LICENSE.qlcnic for copyright and licensing details.
+ */
+
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
@@ -5,9 +12,6 @@
 
 #include "qlcnic.h"
 
-#define QLCNIC_MAC_HASH(MAC)\
-       ((((MAC) & 0x70000) >> 0x10) | (((MAC) & 0x70000000000ULL) >> 0x25))
-
 #define TX_ETHER_PKT   0x01
 #define TX_TCP_PKT     0x02
 #define TX_UDP_PKT     0x03
@@ -84,6 +88,8 @@
 #define qlcnic_get_lro_sts_mss(sts_data1)              \
        ((sts_data1 >> 32) & 0x0FFFF)
 
+#define qlcnic_83xx_get_lro_sts_mss(sts) ((sts) & 0xffff)
+
 /* opcode field in status_desc */
 #define QLCNIC_SYN_OFFLOAD     0x03
 #define QLCNIC_RXPKT_DESC      0x04
 #define QLCNIC_RESPONSE_DESC   0x05
 #define QLCNIC_LRO_DESC        0x12
 
+#define QLCNIC_TX_POLL_BUDGET          128
+#define QLCNIC_TCP_HDR_SIZE            20
+#define QLCNIC_TCP_TS_OPTION_SIZE      12
+#define QLCNIC_FETCH_RING_ID(handle)   ((handle) >> 63)
+#define QLCNIC_DESC_OWNER_FW           cpu_to_le64(STATUS_OWNER_PHANTOM)
+
+#define QLCNIC_TCP_TS_HDR_SIZE (QLCNIC_TCP_HDR_SIZE + QLCNIC_TCP_TS_OPTION_SIZE)
+
 /* for status field in status_desc */
 #define STATUS_CKSUM_LOOP      0
 #define STATUS_CKSUM_OK                2
 
-static void qlcnic_change_filter(struct qlcnic_adapter *adapter,
-                                u64 uaddr, __le16 vlan_id,
-                                struct qlcnic_host_tx_ring *tx_ring)
+#define qlcnic_83xx_pktln(sts)         ((sts >> 32) & 0x3FFF)
+#define qlcnic_83xx_hndl(sts)          ((sts >> 48) & 0x7FFF)
+#define qlcnic_83xx_csum_status(sts)   ((sts >> 39) & 7)
+#define qlcnic_83xx_opcode(sts)        ((sts >> 42) & 0xF)
+#define qlcnic_83xx_vlan_tag(sts)      (((sts) >> 48) & 0xFFFF)
+#define qlcnic_83xx_lro_pktln(sts)     (((sts) >> 32) & 0x3FFF)
+#define qlcnic_83xx_l2_hdr_off(sts)    (((sts) >> 16) & 0xFF)
+#define qlcnic_83xx_l4_hdr_off(sts)    (((sts) >> 24) & 0xFF)
+#define qlcnic_83xx_pkt_cnt(sts)       (((sts) >> 16) & 0x7)
+#define qlcnic_83xx_is_tstamp(sts)     (((sts) >> 40) & 1)
+#define qlcnic_83xx_is_psh_bit(sts)    (((sts) >> 41) & 1)
+#define qlcnic_83xx_is_ip_align(sts)   (((sts) >> 46) & 1)
+#define qlcnic_83xx_has_vlan_tag(sts)  (((sts) >> 47) & 1)
+
+struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *,
+                                    struct qlcnic_host_rds_ring *, u16, u16);
+
+inline void qlcnic_83xx_enable_tx_intr(struct qlcnic_adapter *adapter,
+                                      struct qlcnic_host_tx_ring *tx_ring)
+{
+       writel(0, tx_ring->crb_intr_mask);
+}
+
+inline void qlcnic_83xx_disable_tx_intr(struct qlcnic_adapter *adapter,
+                                       struct qlcnic_host_tx_ring *tx_ring)
+{
+       writel(1, tx_ring->crb_intr_mask);
+}
+
+static inline u8 qlcnic_mac_hash(u64 mac)
+{
+       return (u8)((mac & 0xff) ^ ((mac >> 40) & 0xff));
+}
+
+static inline u32 qlcnic_get_ref_handle(struct qlcnic_adapter *adapter,
+                                       u16 handle, u8 ring_id)
+{
+       if (adapter->pdev->device == PCI_DEVICE_ID_QLOGIC_QLE834X)
+               return handle | (ring_id << 15);
+       else
+               return handle;
+}
+
+static inline int qlcnic_82xx_is_lb_pkt(u64 sts_data)
+{
+       return (qlcnic_get_sts_status(sts_data) == STATUS_CKSUM_LOOP) ? 1 : 0;
+}
+
+void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
+                         int loopback_pkt, __le16 vlan_id)
+{
+       struct ethhdr *phdr = (struct ethhdr *)(skb->data);
+       struct qlcnic_filter *fil, *tmp_fil;
+       struct hlist_node *n;
+       struct hlist_head *head;
+       unsigned long time;
+       u64 src_addr = 0;
+       u8 hindex, found = 0, op;
+       int ret;
+
+       memcpy(&src_addr, phdr->h_source, ETH_ALEN);
+
+       if (loopback_pkt) {
+               if (adapter->rx_fhash.fnum >= adapter->rx_fhash.fmax)
+                       return;
+
+               hindex = qlcnic_mac_hash(src_addr) &
+                        (adapter->fhash.fbucket_size - 1);
+               head = &(adapter->rx_fhash.fhead[hindex]);
+
+               hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
+                       if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
+                           tmp_fil->vlan_id == vlan_id) {
+                               time = tmp_fil->ftime;
+                               if (jiffies > (QLCNIC_READD_AGE * HZ + time))
+                                       tmp_fil->ftime = jiffies;
+                               return;
+                       }
+               }
+
+               fil = kzalloc(sizeof(struct qlcnic_filter), GFP_ATOMIC);
+               if (!fil)
+                       return;
+
+               fil->ftime = jiffies;
+               memcpy(fil->faddr, &src_addr, ETH_ALEN);
+               fil->vlan_id = vlan_id;
+               spin_lock(&adapter->rx_mac_learn_lock);
+               hlist_add_head(&(fil->fnode), head);
+               adapter->rx_fhash.fnum++;
+               spin_unlock(&adapter->rx_mac_learn_lock);
+       } else {
+               hindex = qlcnic_mac_hash(src_addr) &
+                        (adapter->fhash.fbucket_size - 1);
+               head = &(adapter->rx_fhash.fhead[hindex]);
+               spin_lock(&adapter->rx_mac_learn_lock);
+               hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
+                       if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
+                           tmp_fil->vlan_id == vlan_id) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               if (!found) {
+                       spin_unlock(&adapter->rx_mac_learn_lock);
+                       return;
+               }
+
+               op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD;
+               ret = qlcnic_sre_macaddr_change(adapter, (u8 *)&src_addr,
+                                               vlan_id, op);
+               if (!ret) {
+                       op = vlan_id ? QLCNIC_MAC_VLAN_DEL : QLCNIC_MAC_DEL;
+                       ret = qlcnic_sre_macaddr_change(adapter,
+                                                       (u8 *)&src_addr,
+                                                       vlan_id, op);
+                       if (!ret) {
+                               hlist_del(&(tmp_fil->fnode));
+                               adapter->rx_fhash.fnum--;
+                       }
+               }
+               spin_unlock(&adapter->rx_mac_learn_lock);
+       }
+}
+
+void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,
+                              __le16 vlan_id)
 {
        struct cmd_desc_type0 *hwdesc;
        struct qlcnic_nic_req *req;
        struct qlcnic_mac_req *mac_req;
        struct qlcnic_vlan_req *vlan_req;
+       struct qlcnic_host_tx_ring *tx_ring = adapter->tx_ring;
        u32 producer;
        u64 word;
 
@@ -128,14 +268,14 @@ static void qlcnic_change_filter(struct qlcnic_adapter *adapter,
 }
 
 static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
-                              struct qlcnic_host_tx_ring *tx_ring,
                               struct cmd_desc_type0 *first_desc,
                               struct sk_buff *skb)
 {
-       struct ethhdr *phdr = (struct ethhdr *)(skb->data);
        struct qlcnic_filter *fil, *tmp_fil;
-       struct hlist_node *tmp_hnode, *n;
+       struct hlist_node *n;
        struct hlist_head *head;
+       struct net_device *netdev = adapter->netdev;
+       struct ethhdr *phdr = (struct ethhdr *)(skb->data);
        u64 src_addr = 0;
        __le16 vlan_id = 0;
        u8 hindex;
@@ -143,23 +283,23 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
        if (ether_addr_equal(phdr->h_source, adapter->mac_addr))
                return;
 
-       if (adapter->fhash.fnum >= adapter->fhash.fmax)
+       if (adapter->fhash.fnum >= adapter->fhash.fmax) {
+               adapter->stats.mac_filter_limit_overrun++;
+               netdev_info(netdev, "Can not add more than %d mac addresses\n",
+                           adapter->fhash.fmax);
                return;
+       }
 
-       /* Only NPAR capable devices support vlan based learning*/
-       if (adapter->flags & QLCNIC_ESWITCH_ENABLED)
-               vlan_id = first_desc->vlan_TCI;
        memcpy(&src_addr, phdr->h_source, ETH_ALEN);
-       hindex = QLCNIC_MAC_HASH(src_addr) & (QLCNIC_LB_MAX_FILTERS - 1);
+       hindex = qlcnic_mac_hash(src_addr) & (adapter->fhash.fbucket_size - 1);
        head = &(adapter->fhash.fhead[hindex]);
 
-       hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+       hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
-                           tmp_fil->vlan_id == vlan_id) {
-
+                   tmp_fil->vlan_id == vlan_id) {
                        if (jiffies > (QLCNIC_READD_AGE * HZ + tmp_fil->ftime))
-                               qlcnic_change_filter(adapter, src_addr, vlan_id,
-                                                    tx_ring);
+                               qlcnic_change_filter(adapter, &src_addr,
+                                                    vlan_id);
                        tmp_fil->ftime = jiffies;
                        return;
                }
@@ -169,17 +309,13 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
        if (!fil)
                return;
 
-       qlcnic_change_filter(adapter, src_addr, vlan_id, tx_ring);
-
+       qlcnic_change_filter(adapter, &src_addr, vlan_id);
        fil->ftime = jiffies;
        fil->vlan_id = vlan_id;
        memcpy(fil->faddr, &src_addr, ETH_ALEN);
-
        spin_lock(&adapter->mac_learn_lock);
-
        hlist_add_head(&(fil->fnode), head);
        adapter->fhash.fnum++;
-
        spin_unlock(&adapter->mac_learn_lock);
 }
 
@@ -474,8 +610,8 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        if (unlikely(qlcnic_tx_pkt(adapter, first_desc, skb)))
                goto unwind_buff;
 
-       if (adapter->mac_learn)
-               qlcnic_send_filter(adapter, tx_ring, first_desc, skb);
+       if (adapter->drv_mac_learn)
+               qlcnic_send_filter(adapter, first_desc, skb);
 
        adapter->stats.txbytes += skb->len;
        adapter->stats.xmitcalled++;
@@ -528,8 +664,8 @@ static int qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter,
        }
 
        skb_reserve(skb, NET_IP_ALIGN);
-       dma = pci_map_single(pdev, skb->data, rds_ring->dma_size,
-                            PCI_DMA_FROMDEVICE);
+       dma = pci_map_single(pdev, skb->data,
+                            rds_ring->dma_size, PCI_DMA_FROMDEVICE);
 
        if (pci_dma_mapping_error(pdev, dma)) {
                adapter->stats.rx_dma_map_error++;
@@ -544,12 +680,13 @@ static int qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter,
 }
 
 static void qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter,
-                                        struct qlcnic_host_rds_ring *rds_ring)
+                                       struct qlcnic_host_rds_ring *rds_ring,
+                                       u8 ring_id)
 {
        struct rcv_desc *pdesc;
        struct qlcnic_rx_buffer *buffer;
        int  count = 0;
-       uint32_t producer;
+       uint32_t producer, handle;
        struct list_head *head;
 
        if (!spin_trylock(&rds_ring->lock))
@@ -557,7 +694,6 @@ static void qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter,
 
        producer = rds_ring->producer;
        head = &rds_ring->free_list;
-
        while (!list_empty(head)) {
                buffer = list_entry(head->next, struct qlcnic_rx_buffer, list);
 
@@ -565,28 +701,29 @@ static void qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter,
                        if (qlcnic_alloc_rx_skb(adapter, rds_ring, buffer))
                                break;
                }
-
                count++;
                list_del(&buffer->list);
 
                /* make a rcv descriptor  */
                pdesc = &rds_ring->desc_head[producer];
-               pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);
+               handle = qlcnic_get_ref_handle(adapter,
+                                              buffer->ref_handle, ring_id);
+               pdesc->reference_handle = cpu_to_le16(handle);
                pdesc->buffer_length = cpu_to_le32(rds_ring->dma_size);
                pdesc->addr_buffer = cpu_to_le64(buffer->dma);
                producer = get_next_index(producer, rds_ring->num_desc);
        }
-
        if (count) {
                rds_ring->producer = producer;
                writel((producer - 1) & (rds_ring->num_desc - 1),
                       rds_ring->crb_rcv_producer);
        }
-
        spin_unlock(&rds_ring->lock);
 }
 
-static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
+static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter,
+                                  struct qlcnic_host_tx_ring *tx_ring,
+                                  int budget)
 {
        u32 sw_consumer, hw_consumer;
        int i, done, count = 0;
@@ -594,7 +731,6 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
        struct pci_dev *pdev = adapter->pdev;
        struct net_device *netdev = adapter->netdev;
        struct qlcnic_skb_frag *frag;
-       struct qlcnic_host_tx_ring *tx_ring = adapter->tx_ring;
 
        if (!spin_trylock(&adapter->tx_clean_lock))
                return 1;
@@ -615,22 +751,19 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
                                               PCI_DMA_TODEVICE);
                                frag->dma = 0ULL;
                        }
-
                        adapter->stats.xmitfinished++;
                        dev_kfree_skb_any(buffer->skb);
                        buffer->skb = NULL;
                }
 
                sw_consumer = get_next_index(sw_consumer, tx_ring->num_desc);
-               if (++count >= MAX_STATUS_HANDLE)
+               if (++count >= budget)
                        break;
        }
 
        if (count && netif_running(netdev)) {
                tx_ring->sw_consumer = sw_consumer;
-
                smp_mb();
-
                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
                        if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH) {
                                netif_wake_queue(netdev);
@@ -654,7 +787,6 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
         */
        hw_consumer = le32_to_cpu(*(tx_ring->hw_consumer));
        done = (sw_consumer == hw_consumer);
-
        spin_unlock(&adapter->tx_clean_lock);
 
        return done;
@@ -662,16 +794,15 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter)
 
 static int qlcnic_poll(struct napi_struct *napi, int budget)
 {
+       int tx_complete, work_done;
        struct qlcnic_host_sds_ring *sds_ring;
        struct qlcnic_adapter *adapter;
-       int tx_complete, work_done;
 
        sds_ring = container_of(napi, struct qlcnic_host_sds_ring, napi);
        adapter = sds_ring->adapter;
-
-       tx_complete = qlcnic_process_cmd_ring(adapter);
+       tx_complete = qlcnic_process_cmd_ring(adapter, adapter->tx_ring,
+                                             budget);
        work_done = qlcnic_process_rcv_ring(sds_ring, budget);
-
        if ((work_done < budget) && tx_complete) {
                napi_complete(&sds_ring->napi);
                if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
@@ -804,26 +935,23 @@ static void qlcnic_handle_fw_message(int desc_cnt, int index,
        }
 }
 
-static struct sk_buff *
-qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
-                    struct qlcnic_host_rds_ring *rds_ring, u16 index,
-                    u16 cksum)
+struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_host_rds_ring *ring,
+                                    u16 index, u16 cksum)
 {
        struct qlcnic_rx_buffer *buffer;
        struct sk_buff *skb;
 
-       buffer = &rds_ring->rx_buf_arr[index];
-
+       buffer = &ring->rx_buf_arr[index];
        if (unlikely(buffer->skb == NULL)) {
                WARN_ON(1);
                return NULL;
        }
 
-       pci_unmap_single(adapter->pdev, buffer->dma, rds_ring->dma_size,
+       pci_unmap_single(adapter->pdev, buffer->dma, ring->dma_size,
                         PCI_DMA_FROMDEVICE);
 
        skb = buffer->skb;
-
        if (likely((adapter->netdev->features & NETIF_F_RXCSUM) &&
                   (cksum == STATUS_CKSUM_OK || cksum == STATUS_CKSUM_LOOP))) {
                adapter->stats.csummed++;
@@ -832,6 +960,7 @@ qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
                skb_checksum_none_assert(skb);
        }
 
+
        buffer->skb = NULL;
 
        return skb;
@@ -871,8 +1000,8 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter,
        struct qlcnic_rx_buffer *buffer;
        struct sk_buff *skb;
        struct qlcnic_host_rds_ring *rds_ring;
-       int index, length, cksum, pkt_offset;
-       u16 vid = 0xffff;
+       int index, length, cksum, pkt_offset, is_lb_pkt;
+       u16 vid = 0xffff, t_vid;
 
        if (unlikely(ring >= adapter->max_rds_rings))
                return NULL;
@@ -892,6 +1021,14 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter,
        if (!skb)
                return buffer;
 
+       if (adapter->drv_mac_learn &&
+           (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+               t_vid = 0;
+               is_lb_pkt = qlcnic_82xx_is_lb_pkt(sts_data0);
+               qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
+                                    cpu_to_le16(t_vid));
+       }
+
        if (length > rds_ring->skb_size)
                skb_put(skb, rds_ring->skb_size);
        else
@@ -933,10 +1070,11 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
        struct sk_buff *skb;
        struct qlcnic_host_rds_ring *rds_ring;
        struct iphdr *iph;
+       struct ipv6hdr *ipv6h;
        struct tcphdr *th;
        bool push, timestamp;
-       int index, l2_hdr_offset, l4_hdr_offset;
-       u16 lro_length, length, data_offset, vid = 0xffff;
+       int index, l2_hdr_offset, l4_hdr_offset, is_lb_pkt;
+       u16 lro_length, length, data_offset, t_vid, vid = 0xffff;
        u32 seq_number;
 
        if (unlikely(ring > adapter->max_rds_rings))
@@ -961,6 +1099,14 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
        if (!skb)
                return buffer;
 
+       if (adapter->drv_mac_learn &&
+           (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+               t_vid = 0;
+               is_lb_pkt = qlcnic_82xx_is_lb_pkt(sts_data0);
+               qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
+                                    cpu_to_le16(t_vid));
+       }
+
        if (timestamp)
                data_offset = l4_hdr_offset + QLC_TCP_TS_HDR_SIZE;
        else
@@ -976,12 +1122,21 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
        }
 
        skb->protocol = eth_type_trans(skb, netdev);
-       iph = (struct iphdr *)skb->data;
-       th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
-       length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
-       iph->tot_len = htons(length);
-       iph->check = 0;
-       iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
+
+       if (ntohs(skb->protocol) == ETH_P_IPV6) {
+               ipv6h = (struct ipv6hdr *)skb->data;
+               th = (struct tcphdr *)(skb->data + sizeof(struct ipv6hdr));
+               length = (th->doff << 2) + lro_length;
+               ipv6h->payload_len = htons(length);
+       } else {
+               iph = (struct iphdr *)skb->data;
+               th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
+               length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
+               iph->tot_len = htons(length);
+               iph->check = 0;
+               iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
+       }
+
        th->psh = push;
        th->seq = htonl(seq_number);
        length = skb->len;
@@ -1011,9 +1166,9 @@ int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max)
        struct list_head *cur;
        struct status_desc *desc;
        struct qlcnic_rx_buffer *rxbuf;
+       int opcode, desc_cnt, count = 0;
        u64 sts_data0, sts_data1;
-       __le64 owner_phantom = cpu_to_le64(STATUS_OWNER_PHANTOM);
-       int opcode, ring, desc_cnt, count = 0;
+       u8 ring;
        u32 consumer = sds_ring->consumer;
 
        while (count < max) {
@@ -1025,7 +1180,6 @@ int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max)
 
                desc_cnt = qlcnic_get_sts_desc_cnt(sts_data0);
                opcode = qlcnic_get_sts_opcode(sts_data0);
-
                switch (opcode) {
                case QLCNIC_RXPKT_DESC:
                case QLCNIC_OLD_RXPKT_DESC:
@@ -1045,18 +1199,16 @@ int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max)
                default:
                        goto skip;
                }
-
                WARN_ON(desc_cnt > 1);
 
                if (likely(rxbuf))
                        list_add_tail(&rxbuf->list, &sds_ring->free_list[ring]);
                else
                        adapter->stats.null_rxbuf++;
-
 skip:
                for (; desc_cnt > 0; desc_cnt--) {
                        desc = &sds_ring->desc_head[consumer];
-                       desc->status_desc_data[0] = owner_phantom;
+                       desc->status_desc_data[0] = QLCNIC_DESC_OWNER_FW;
                        consumer = get_next_index(consumer, sds_ring->num_desc);
                }
                count++;
@@ -1064,7 +1216,6 @@ skip:
 
        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
                rds_ring = &adapter->recv_ctx->rds_rings[ring];
-
                if (!list_empty(&sds_ring->free_list[ring])) {
                        list_for_each(cur, &sds_ring->free_list[ring]) {
                                rxbuf = list_entry(cur, struct qlcnic_rx_buffer,
@@ -1077,7 +1228,7 @@ skip:
                        spin_unlock(&rds_ring->lock);
                }
 
-               qlcnic_post_rx_buffers_nodb(adapter, rds_ring);
+               qlcnic_post_rx_buffers_nodb(adapter, rds_ring, ring);
        }
 
        if (count) {
@@ -1089,12 +1240,12 @@ skip:
 }
 
 void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter,
-                           struct qlcnic_host_rds_ring *rds_ring)
+                           struct qlcnic_host_rds_ring *rds_ring, u8 ring_id)
 {
        struct rcv_desc *pdesc;
        struct qlcnic_rx_buffer *buffer;
        int count = 0;
-       u32 producer;
+       u32 producer, handle;
        struct list_head *head;
 
        producer = rds_ring->producer;
@@ -1115,7 +1266,9 @@ void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter,
                /* make a rcv descriptor  */
                pdesc = &rds_ring->desc_head[producer];
                pdesc->addr_buffer = cpu_to_le64(buffer->dma);
-               pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);
+               handle = qlcnic_get_ref_handle(adapter, buffer->ref_handle,
+                                              ring_id);
+               pdesc->reference_handle = cpu_to_le16(handle);
                pdesc->buffer_length = cpu_to_le32(rds_ring->dma_size);
                producer = get_next_index(producer, rds_ring->num_desc);
        }
@@ -1185,7 +1338,7 @@ static void qlcnic_process_rcv_diag(struct qlcnic_adapter *adapter, int ring,
        return;
 }
 
-void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
+void qlcnic_82xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
 {
        struct qlcnic_adapter *adapter = sds_ring->adapter;
        struct status_desc *desc;
@@ -1222,26 +1375,8 @@ void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
        writel(consumer, sds_ring->crb_sts_consumer);
 }
 
-void qlcnic_fetch_mac(u32 off1, u32 off2, u8 alt_mac, u8 *mac)
-{
-       u32 mac_low, mac_high;
-       int i;
-
-       mac_low = off1;
-       mac_high = off2;
-
-       if (alt_mac) {
-               mac_low |= (mac_low >> 16) | (mac_high << 16);
-               mac_high >>= 16;
-       }
-
-       for (i = 0; i < 2; i++)
-               mac[i] = (u8)(mac_high >> ((1 - i) * 8));
-       for (i = 2; i < 6; i++)
-               mac[i] = (u8)(mac_low >> ((5 - i) * 8));
-}
-
-int qlcnic_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev)
+int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
+                        struct net_device *netdev)
 {
        int ring, max_sds_rings;
        struct qlcnic_host_sds_ring *sds_ring;
@@ -1254,8 +1389,7 @@ int qlcnic_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev)
 
        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                sds_ring = &recv_ctx->sds_rings[ring];
-
-               if (ring == max_sds_rings - 1)
+               if (ring == adapter->max_sds_rings - 1)
                        netif_napi_add(netdev, &sds_ring->napi, qlcnic_poll,
                                       QLCNIC_NETDEV_WEIGHT / max_sds_rings);
                else
@@ -1263,10 +1397,15 @@ int qlcnic_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev)
                                       QLCNIC_NETDEV_WEIGHT*2);
        }
 
+       if (qlcnic_alloc_tx_rings(adapter, netdev)) {
+               qlcnic_free_sds_rings(recv_ctx);
+               return -ENOMEM;
+       }
+
        return 0;
 }
 
-void qlcnic_napi_del(struct qlcnic_adapter *adapter)
+void qlcnic_82xx_napi_del(struct qlcnic_adapter *adapter)
 {
        int ring;
        struct qlcnic_host_sds_ring *sds_ring;
@@ -1278,9 +1417,10 @@ void qlcnic_napi_del(struct qlcnic_adapter *adapter)
        }
 
        qlcnic_free_sds_rings(adapter->recv_ctx);
+       qlcnic_free_tx_rings(adapter);
 }
 
-void qlcnic_napi_enable(struct qlcnic_adapter *adapter)
+void qlcnic_82xx_napi_enable(struct qlcnic_adapter *adapter)
 {
        int ring;
        struct qlcnic_host_sds_ring *sds_ring;
@@ -1296,7 +1436,7 @@ void qlcnic_napi_enable(struct qlcnic_adapter *adapter)
        }
 }
 
-void qlcnic_napi_disable(struct qlcnic_adapter *adapter)
+void qlcnic_82xx_napi_disable(struct qlcnic_adapter *adapter)
 {
        int ring;
        struct qlcnic_host_sds_ring *sds_ring;
@@ -1312,3 +1452,481 @@ void qlcnic_napi_disable(struct qlcnic_adapter *adapter)
                napi_disable(&sds_ring->napi);
        }
 }
+
+#define QLC_83XX_NORMAL_LB_PKT (1ULL << 36)
+#define QLC_83XX_LRO_LB_PKT    (1ULL << 46)
+
+static inline int qlcnic_83xx_is_lb_pkt(u64 sts_data, int lro_pkt)
+{
+       if (lro_pkt)
+               return (sts_data & QLC_83XX_LRO_LB_PKT) ? 1 : 0;
+       else
+               return (sts_data & QLC_83XX_NORMAL_LB_PKT) ? 1 : 0;
+}
+
+static struct qlcnic_rx_buffer *
+qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
+                       struct qlcnic_host_sds_ring *sds_ring,
+                       u8 ring, u64 sts_data[])
+{
+       struct net_device *netdev = adapter->netdev;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+       struct qlcnic_rx_buffer *buffer;
+       struct sk_buff *skb;
+       struct qlcnic_host_rds_ring *rds_ring;
+       int index, length, cksum, is_lb_pkt;
+       u16 vid = 0xffff, t_vid;
+
+       if (unlikely(ring >= adapter->max_rds_rings))
+               return NULL;
+
+       rds_ring = &recv_ctx->rds_rings[ring];
+
+       index = qlcnic_83xx_hndl(sts_data[0]);
+       if (unlikely(index >= rds_ring->num_desc))
+               return NULL;
+
+       buffer = &rds_ring->rx_buf_arr[index];
+       length = qlcnic_83xx_pktln(sts_data[0]);
+       cksum  = qlcnic_83xx_csum_status(sts_data[1]);
+       skb = qlcnic_process_rxbuf(adapter, rds_ring, index, cksum);
+       if (!skb)
+               return buffer;
+
+       if (adapter->drv_mac_learn &&
+           (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+               t_vid = 0;
+               is_lb_pkt = qlcnic_83xx_is_lb_pkt(sts_data[1], 0);
+               qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
+                                    cpu_to_le16(t_vid));
+       }
+
+       if (length > rds_ring->skb_size)
+               skb_put(skb, rds_ring->skb_size);
+       else
+               skb_put(skb, length);
+
+       if (unlikely(qlcnic_check_rx_tagging(adapter, skb, &vid))) {
+               adapter->stats.rxdropped++;
+               dev_kfree_skb(skb);
+               return buffer;
+       }
+
+       skb->protocol = eth_type_trans(skb, netdev);
+
+       if (vid != 0xffff)
+               __vlan_hwaccel_put_tag(skb, vid);
+
+       napi_gro_receive(&sds_ring->napi, skb);
+
+       adapter->stats.rx_pkts++;
+       adapter->stats.rxbytes += length;
+
+       return buffer;
+}
+
+static struct qlcnic_rx_buffer *
+qlcnic_83xx_process_lro(struct qlcnic_adapter *adapter,
+                       u8 ring, u64 sts_data[])
+{
+       struct net_device *netdev = adapter->netdev;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+       struct qlcnic_rx_buffer *buffer;
+       struct sk_buff *skb;
+       struct qlcnic_host_rds_ring *rds_ring;
+       struct iphdr *iph;
+       struct ipv6hdr *ipv6h;
+       struct tcphdr *th;
+       bool push;
+       int l2_hdr_offset, l4_hdr_offset;
+       int index, is_lb_pkt;
+       u16 lro_length, length, data_offset, gso_size;
+       u16 vid = 0xffff, t_vid;
+
+       if (unlikely(ring > adapter->max_rds_rings))
+               return NULL;
+
+       rds_ring = &recv_ctx->rds_rings[ring];
+
+       index = qlcnic_83xx_hndl(sts_data[0]);
+       if (unlikely(index > rds_ring->num_desc))
+               return NULL;
+
+       buffer = &rds_ring->rx_buf_arr[index];
+
+       lro_length = qlcnic_83xx_lro_pktln(sts_data[0]);
+       l2_hdr_offset = qlcnic_83xx_l2_hdr_off(sts_data[1]);
+       l4_hdr_offset = qlcnic_83xx_l4_hdr_off(sts_data[1]);
+       push = qlcnic_83xx_is_psh_bit(sts_data[1]);
+
+       skb = qlcnic_process_rxbuf(adapter, rds_ring, index, STATUS_CKSUM_OK);
+       if (!skb)
+               return buffer;
+
+       if (adapter->drv_mac_learn &&
+           (adapter->flags & QLCNIC_ESWITCH_ENABLED)) {
+               t_vid = 0;
+               is_lb_pkt = qlcnic_83xx_is_lb_pkt(sts_data[1], 1);
+               qlcnic_add_lb_filter(adapter, skb, is_lb_pkt,
+                                    cpu_to_le16(t_vid));
+       }
+       if (qlcnic_83xx_is_tstamp(sts_data[1]))
+               data_offset = l4_hdr_offset + QLCNIC_TCP_TS_HDR_SIZE;
+       else
+               data_offset = l4_hdr_offset + QLCNIC_TCP_HDR_SIZE;
+
+       skb_put(skb, lro_length + data_offset);
+       skb_pull(skb, l2_hdr_offset);
+
+       if (unlikely(qlcnic_check_rx_tagging(adapter, skb, &vid))) {
+               adapter->stats.rxdropped++;
+               dev_kfree_skb(skb);
+               return buffer;
+       }
+
+       skb->protocol = eth_type_trans(skb, netdev);
+       if (ntohs(skb->protocol) == ETH_P_IPV6) {
+               ipv6h = (struct ipv6hdr *)skb->data;
+               th = (struct tcphdr *)(skb->data + sizeof(struct ipv6hdr));
+
+               length = (th->doff << 2) + lro_length;
+               ipv6h->payload_len = htons(length);
+       } else {
+               iph = (struct iphdr *)skb->data;
+               th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
+               length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
+               iph->tot_len = htons(length);
+               iph->check = 0;
+               iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
+       }
+
+       th->psh = push;
+       length = skb->len;
+
+       if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP) {
+               gso_size = qlcnic_83xx_get_lro_sts_mss(sts_data[0]);
+               skb_shinfo(skb)->gso_size = gso_size;
+               if (skb->protocol == htons(ETH_P_IPV6))
+                       skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+               else
+                       skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+       }
+
+       if (vid != 0xffff)
+               __vlan_hwaccel_put_tag(skb, vid);
+
+       netif_receive_skb(skb);
+
+       adapter->stats.lro_pkts++;
+       adapter->stats.lrobytes += length;
+       return buffer;
+}
+
+static int qlcnic_83xx_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring,
+                                       int max)
+{
+       struct qlcnic_host_rds_ring *rds_ring;
+       struct qlcnic_adapter *adapter = sds_ring->adapter;
+       struct list_head *cur;
+       struct status_desc *desc;
+       struct qlcnic_rx_buffer *rxbuf = NULL;
+       u8 ring;
+       u64 sts_data[2];
+       int count = 0, opcode;
+       u32 consumer = sds_ring->consumer;
+
+       while (count < max) {
+               desc = &sds_ring->desc_head[consumer];
+               sts_data[1] = le64_to_cpu(desc->status_desc_data[1]);
+               opcode = qlcnic_83xx_opcode(sts_data[1]);
+               if (!opcode)
+                       break;
+               sts_data[0] = le64_to_cpu(desc->status_desc_data[0]);
+               ring = QLCNIC_FETCH_RING_ID(sts_data[0]);
+
+               switch (opcode) {
+               case QLC_83XX_REG_DESC:
+                       rxbuf = qlcnic_83xx_process_rcv(adapter, sds_ring,
+                                                       ring, sts_data);
+                       break;
+               case QLC_83XX_LRO_DESC:
+                       rxbuf = qlcnic_83xx_process_lro(adapter, ring,
+                                                       sts_data);
+                       break;
+               default:
+                       dev_info(&adapter->pdev->dev,
+                                "Unkonwn opcode: 0x%x\n", opcode);
+                       goto skip;
+               }
+
+               if (likely(rxbuf))
+                       list_add_tail(&rxbuf->list, &sds_ring->free_list[ring]);
+               else
+                       adapter->stats.null_rxbuf++;
+skip:
+               desc = &sds_ring->desc_head[consumer];
+               /* Reset the descriptor */
+               desc->status_desc_data[1] = 0;
+               consumer = get_next_index(consumer, sds_ring->num_desc);
+               count++;
+       }
+       for (ring = 0; ring < adapter->max_rds_rings; ring++) {
+               rds_ring = &adapter->recv_ctx->rds_rings[ring];
+               if (!list_empty(&sds_ring->free_list[ring])) {
+                       list_for_each(cur, &sds_ring->free_list[ring]) {
+                               rxbuf = list_entry(cur, struct qlcnic_rx_buffer,
+                                                  list);
+                               qlcnic_alloc_rx_skb(adapter, rds_ring, rxbuf);
+                       }
+                       spin_lock(&rds_ring->lock);
+                       list_splice_tail_init(&sds_ring->free_list[ring],
+                                             &rds_ring->free_list);
+                       spin_unlock(&rds_ring->lock);
+               }
+               qlcnic_post_rx_buffers_nodb(adapter, rds_ring, ring);
+       }
+       if (count) {
+               sds_ring->consumer = consumer;
+               writel(consumer, sds_ring->crb_sts_consumer);
+       }
+       return count;
+}
+
+static int qlcnic_83xx_poll(struct napi_struct *napi, int budget)
+{
+       int tx_complete;
+       int work_done;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_adapter *adapter;
+       struct qlcnic_host_tx_ring *tx_ring;
+
+       sds_ring = container_of(napi, struct qlcnic_host_sds_ring, napi);
+       adapter = sds_ring->adapter;
+       /* tx ring count = 1 */
+       tx_ring = adapter->tx_ring;
+
+       tx_complete = qlcnic_process_cmd_ring(adapter, tx_ring, budget);
+       work_done = qlcnic_83xx_process_rcv_ring(sds_ring, budget);
+       if ((work_done < budget) && tx_complete) {
+               napi_complete(&sds_ring->napi);
+               qlcnic_83xx_enable_intr(adapter, sds_ring);
+       }
+
+       return work_done;
+}
+
+static int qlcnic_83xx_msix_tx_poll(struct napi_struct *napi, int budget)
+{
+       int work_done;
+       struct qlcnic_host_tx_ring *tx_ring;
+       struct qlcnic_adapter *adapter;
+
+       budget = QLCNIC_TX_POLL_BUDGET;
+       tx_ring = container_of(napi, struct qlcnic_host_tx_ring, napi);
+       adapter = tx_ring->adapter;
+       work_done = qlcnic_process_cmd_ring(adapter, tx_ring, budget);
+       if (work_done) {
+               napi_complete(&tx_ring->napi);
+               if (test_bit(__QLCNIC_DEV_UP , &adapter->state))
+                       qlcnic_83xx_enable_tx_intr(adapter, tx_ring);
+       }
+
+       return work_done;
+}
+
+static int qlcnic_83xx_rx_poll(struct napi_struct *napi, int budget)
+{
+       int work_done;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_adapter *adapter;
+
+       sds_ring = container_of(napi, struct qlcnic_host_sds_ring, napi);
+       adapter = sds_ring->adapter;
+       work_done = qlcnic_83xx_process_rcv_ring(sds_ring, budget);
+       if (work_done < budget) {
+               napi_complete(&sds_ring->napi);
+               if (test_bit(__QLCNIC_DEV_UP, &adapter->state))
+                       qlcnic_83xx_enable_intr(adapter, sds_ring);
+       }
+
+       return work_done;
+}
+
+void qlcnic_83xx_napi_enable(struct qlcnic_adapter *adapter)
+{
+       int ring;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_host_tx_ring *tx_ring;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+
+       if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+               return;
+
+       for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+               sds_ring = &recv_ctx->sds_rings[ring];
+               napi_enable(&sds_ring->napi);
+               if (adapter->flags & QLCNIC_MSIX_ENABLED)
+                       qlcnic_83xx_enable_intr(adapter, sds_ring);
+       }
+
+       if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+               for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                       tx_ring = &adapter->tx_ring[ring];
+                       napi_enable(&tx_ring->napi);
+                       qlcnic_83xx_enable_tx_intr(adapter, tx_ring);
+               }
+       }
+}
+
+void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
+{
+       int ring;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+       struct qlcnic_host_tx_ring *tx_ring;
+
+       if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
+               return;
+
+       for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+               sds_ring = &recv_ctx->sds_rings[ring];
+               if (adapter->flags & QLCNIC_MSIX_ENABLED)
+                       qlcnic_83xx_disable_intr(adapter, sds_ring);
+               napi_synchronize(&sds_ring->napi);
+               napi_disable(&sds_ring->napi);
+       }
+
+       if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+               for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                       tx_ring = &adapter->tx_ring[ring];
+                       qlcnic_83xx_disable_tx_intr(adapter, tx_ring);
+                       napi_synchronize(&tx_ring->napi);
+                       napi_disable(&tx_ring->napi);
+               }
+       }
+}
+
+int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
+                        struct net_device *netdev)
+{
+       int ring, max_sds_rings;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_host_tx_ring *tx_ring;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+
+       if (qlcnic_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
+               return -ENOMEM;
+
+       max_sds_rings = adapter->max_sds_rings;
+       for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+               sds_ring = &recv_ctx->sds_rings[ring];
+               if (adapter->flags & QLCNIC_MSIX_ENABLED)
+                       netif_napi_add(netdev, &sds_ring->napi,
+                                      qlcnic_83xx_rx_poll,
+                                      QLCNIC_NETDEV_WEIGHT * 2);
+               else
+                       netif_napi_add(netdev, &sds_ring->napi,
+                                      qlcnic_83xx_poll,
+                                      QLCNIC_NETDEV_WEIGHT / max_sds_rings);
+       }
+
+       if (qlcnic_alloc_tx_rings(adapter, netdev)) {
+               qlcnic_free_sds_rings(recv_ctx);
+               return -ENOMEM;
+       }
+
+       if (adapter->flags & QLCNIC_MSIX_ENABLED) {
+               for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                       tx_ring = &adapter->tx_ring[ring];
+                       netif_napi_add(netdev, &tx_ring->napi,
+                                      qlcnic_83xx_msix_tx_poll,
+                                      QLCNIC_NETDEV_WEIGHT);
+               }
+       }
+
+       return 0;
+}
+
+void qlcnic_83xx_napi_del(struct qlcnic_adapter *adapter)
+{
+       int ring;
+       struct qlcnic_host_sds_ring *sds_ring;
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+       struct qlcnic_host_tx_ring *tx_ring;
+
+       for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+               sds_ring = &recv_ctx->sds_rings[ring];
+               netif_napi_del(&sds_ring->napi);
+       }
+
+       qlcnic_free_sds_rings(adapter->recv_ctx);
+
+       if ((adapter->flags & QLCNIC_MSIX_ENABLED)) {
+               for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                       tx_ring = &adapter->tx_ring[ring];
+                       netif_napi_del(&tx_ring->napi);
+               }
+       }
+
+       qlcnic_free_tx_rings(adapter);
+}
+
+void qlcnic_83xx_process_rcv_diag(struct qlcnic_adapter *adapter,
+                                 int ring, u64 sts_data[])
+{
+       struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
+       struct sk_buff *skb;
+       struct qlcnic_host_rds_ring *rds_ring;
+       int index, length;
+
+       if (unlikely(ring >= adapter->max_rds_rings))
+               return;
+
+       rds_ring = &recv_ctx->rds_rings[ring];
+       index = qlcnic_83xx_hndl(sts_data[0]);
+       if (unlikely(index >= rds_ring->num_desc))
+               return;
+
+       length = qlcnic_83xx_pktln(sts_data[0]);
+
+       skb = qlcnic_process_rxbuf(adapter, rds_ring, index, STATUS_CKSUM_OK);
+       if (!skb)
+               return;
+
+       if (length > rds_ring->skb_size)
+               skb_put(skb, rds_ring->skb_size);
+       else
+               skb_put(skb, length);
+
+       if (!qlcnic_check_loopback_buff(skb->data, adapter->mac_addr))
+               adapter->ahw->diag_cnt++;
+       else
+               dump_skb(skb, adapter);
+
+       dev_kfree_skb_any(skb);
+       return;
+}
+
+void qlcnic_83xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
+{
+       struct qlcnic_adapter *adapter = sds_ring->adapter;
+       struct status_desc *desc;
+       u64 sts_data[2];
+       int ring, opcode;
+       u32 consumer = sds_ring->consumer;
+
+       desc = &sds_ring->desc_head[consumer];
+       sts_data[0] = le64_to_cpu(desc->status_desc_data[0]);
+       sts_data[1] = le64_to_cpu(desc->status_desc_data[1]);
+       opcode = qlcnic_83xx_opcode(sts_data[1]);
+       if (!opcode)
+               return;
+
+       ring = QLCNIC_FETCH_RING_ID(qlcnic_83xx_hndl(sts_data[0]));
+       qlcnic_83xx_process_rcv_diag(adapter, ring, sts_data);
+       desc = &sds_ring->desc_head[consumer];
+       desc->status_desc_data[0] = cpu_to_le64(STATUS_OWNER_PHANTOM);
+       consumer = get_next_index(consumer, sds_ring->num_desc);
+       sds_ring->consumer = consumer;
+       writel(consumer, sds_ring->crb_sts_consumer);
+}