1 files changed, 114 insertions, 39 deletions

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 90d1f76c0e8b..5768af17f168 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -214,6 +214,10 @@ int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,
                 return -ENOMEM;
         }
 
+        status = ql_sem_spinlock(qdev, SEM_ICB_MASK);
+        if (status)
+                return status;
+
         status = ql_wait_cfg(qdev, bit);
         if (status) {
                 QPRINTK(qdev, IFUP, ERR,
@@ -221,12 +225,8 @@ int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,
                 goto exit;
         }
 
-        status = ql_sem_spinlock(qdev, SEM_ICB_MASK);
-        if (status)
-                goto exit;
         ql_write32(qdev, ICB_L, (u32) map);
         ql_write32(qdev, ICB_H, (u32) (map >> 32));
-        ql_sem_unlock(qdev, SEM_ICB_MASK);      /* does flush too */
 
         mask = CFG_Q_MASK | (bit << 16);
         value = bit | (q_id << CFG_Q_SHIFT);
@@ -237,6 +237,7 @@ int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,
          */
         status = ql_wait_cfg(qdev, bit);
 exit:
+        ql_sem_unlock(qdev, SEM_ICB_MASK);      /* does flush too */
         pci_unmap_single(qdev->pdev, map, size, direction);
         return status;
 }
@@ -412,6 +413,57 @@ exit:
         return status;
 }
 
+/* Set or clear MAC address in hardware. We sometimes
+ * have to clear it to prevent wrong frame routing
+ * especially in a bonding environment.
+ */
+static int ql_set_mac_addr(struct ql_adapter *qdev, int set)
+{
+        int status;
+        char zero_mac_addr[ETH_ALEN];
+        char *addr;
+
+        if (set) {
+                addr = &qdev->ndev->dev_addr[0];
+                QPRINTK(qdev, IFUP, DEBUG,
+                        "Set Mac addr %02x:%02x:%02x:%02x:%02x:%02x\n",
+                        addr[0], addr[1], addr[2], addr[3],
+                        addr[4], addr[5]);
+        } else {
+                memset(zero_mac_addr, 0, ETH_ALEN);
+                addr = &zero_mac_addr[0];
+                QPRINTK(qdev, IFUP, DEBUG,
+                                "Clearing MAC address on %s\n",
+                                qdev->ndev->name);
+        }
+        status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);
+        if (status)
+                return status;
+        status = ql_set_mac_addr_reg(qdev, (u8 *) addr,
+                        MAC_ADDR_TYPE_CAM_MAC, qdev->func * MAX_CQ);
+        ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
+        if (status)
+                QPRINTK(qdev, IFUP, ERR, "Failed to init mac "
+                        "address.\n");
+        return status;
+}
+
+void ql_link_on(struct ql_adapter *qdev)
+{
+        QPRINTK(qdev, LINK, ERR, "%s: Link is up.\n",
+                                 qdev->ndev->name);
+        netif_carrier_on(qdev->ndev);
+        ql_set_mac_addr(qdev, 1);
+}
+
+void ql_link_off(struct ql_adapter *qdev)
+{
+        QPRINTK(qdev, LINK, ERR, "%s: Link is down.\n",
+                                 qdev->ndev->name);
+        netif_carrier_off(qdev->ndev);
+        ql_set_mac_addr(qdev, 0);
+}
+
 /* Get a specific frame routing value from the CAM.
  * Used for debug and reg dump.
  */
@@ -1628,7 +1680,7 @@ static void ql_process_mac_tx_intr(struct ql_adapter *qdev,
         tx_ring = &qdev->tx_ring[mac_rsp->txq_idx];
         tx_ring_desc = &tx_ring->q[mac_rsp->tid];
         ql_unmap_send(qdev, tx_ring_desc, tx_ring_desc->map_cnt);
-        qdev->stats.tx_bytes += tx_ring_desc->map_cnt;
+        qdev->stats.tx_bytes += (tx_ring_desc->skb)->len;
         qdev->stats.tx_packets++;
         dev_kfree_skb(tx_ring_desc->skb);
         tx_ring_desc->skb = NULL;
@@ -1660,13 +1712,13 @@ static void ql_process_mac_tx_intr(struct ql_adapter *qdev,
 /* Fire up a handler to reset the MPI processor. */
 void ql_queue_fw_error(struct ql_adapter *qdev)
 {
-        netif_carrier_off(qdev->ndev);
+        ql_link_off(qdev);
         queue_delayed_work(qdev->workqueue, &qdev->mpi_reset_work, 0);
 }
 
 void ql_queue_asic_error(struct ql_adapter *qdev)
 {
-        netif_carrier_off(qdev->ndev);
+        ql_link_off(qdev);
         ql_disable_interrupts(qdev);
         /* Clear adapter up bit to signal the recovery
          * process that it shouldn't kill the reset worker
@@ -2104,7 +2156,7 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev)
         }
         tx_ring_desc = &tx_ring->q[tx_ring->prod_idx];
         mac_iocb_ptr = tx_ring_desc->queue_entry;
-        memset((void *)mac_iocb_ptr, 0, sizeof(mac_iocb_ptr));
+        memset((void *)mac_iocb_ptr, 0, sizeof(*mac_iocb_ptr));
 
         mac_iocb_ptr->opcode = OPCODE_OB_MAC_IOCB;
         mac_iocb_ptr->tid = tx_ring_desc->index;
@@ -2743,7 +2795,7 @@ static int ql_start_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)
 
         ql_init_tx_ring(qdev, tx_ring);
 
-        err = ql_write_cfg(qdev, wqicb, sizeof(wqicb), CFG_LRQ,
+        err = ql_write_cfg(qdev, wqicb, sizeof(*wqicb), CFG_LRQ,
                            (u16) tx_ring->wq_id);
         if (err) {
                 QPRINTK(qdev, IFUP, ERR, "Failed to load tx_ring.\n");
@@ -3008,7 +3060,7 @@ static int ql_start_rss(struct ql_adapter *qdev)
         int i;
         u8 *hash_id = (u8 *) ricb->hash_cq_id;
 
-        memset((void *)ricb, 0, sizeof(ricb));
+        memset((void *)ricb, 0, sizeof(*ricb));
 
         ricb->base_cq = qdev->rss_ring_first_cq_id | RSS_L4K;
         ricb->flags =
@@ -3030,7 +3082,7 @@ static int ql_start_rss(struct ql_adapter *qdev)
 
         QPRINTK(qdev, IFUP, DEBUG, "Initializing RSS.\n");
 
-        status = ql_write_cfg(qdev, ricb, sizeof(ricb), CFG_LR, 0);
+        status = ql_write_cfg(qdev, ricb, sizeof(*ricb), CFG_LR, 0);
         if (status) {
                 QPRINTK(qdev, IFUP, ERR, "Failed to load RICB.\n");
                 return status;
@@ -3039,25 +3091,40 @@ static int ql_start_rss(struct ql_adapter *qdev)
         return status;
 }
 
-/* Initialize the frame-to-queue routing. */
-static int ql_route_initialize(struct ql_adapter *qdev)
+static int ql_clear_routing_entries(struct ql_adapter *qdev)
 {
-        int status = 0;
-        int i;
+        int i, status = 0;
 
         status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);
         if (status)
                 return status;
-
         /* Clear all the entries in the routing table. */
         for (i = 0; i < 16; i++) {
                 status = ql_set_routing_reg(qdev, i, 0, 0);
                 if (status) {
                         QPRINTK(qdev, IFUP, ERR,
-                                "Failed to init routing register for CAM packets.\n");
-                        goto exit;
+                                "Failed to init routing register for CAM "
+                                "packets.\n");
+                        break;
                 }
         }
+        ql_sem_unlock(qdev, SEM_RT_IDX_MASK);
+        return status;
+}
+
+/* Initialize the frame-to-queue routing. */
+static int ql_route_initialize(struct ql_adapter *qdev)
+{
+        int status = 0;
+
+        status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);
+        if (status)
+                return status;
+
+        /* Clear all the entries in the routing table. */
+        status = ql_clear_routing_entries(qdev);
+        if (status)
+                goto exit;
 
         status = ql_set_routing_reg(qdev, RT_IDX_ALL_ERR_SLOT, RT_IDX_ERR, 1);
         if (status) {
@@ -3096,14 +3163,15 @@ exit:
 
 int ql_cam_route_initialize(struct ql_adapter *qdev)
 {
-        int status;
+        int status, set;
 
-        status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);
-        if (status)
-                return status;
-        status = ql_set_mac_addr_reg(qdev, (u8 *) qdev->ndev->perm_addr,
-                             MAC_ADDR_TYPE_CAM_MAC, qdev->func * MAX_CQ);
-        ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
+        /* If check if the link is up and use to
+         * determine if we are setting or clearing
+         * the MAC address in the CAM.
+         */
+        set = ql_read32(qdev, STS);
+        set &= qdev->port_link_up;
+        status = ql_set_mac_addr(qdev, set);
         if (status) {
                 QPRINTK(qdev, IFUP, ERR, "Failed to init mac address.\n");
                 return status;
@@ -3210,9 +3278,17 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
 {
         u32 value;
         int status = 0;
-        unsigned long end_jiffies = jiffies +
-                max((unsigned long)1, usecs_to_jiffies(30));
+        unsigned long end_jiffies;
 
+        /* Clear all the entries in the routing table. */
+        status = ql_clear_routing_entries(qdev);
+        if (status) {
+                QPRINTK(qdev, IFUP, ERR, "Failed to clear routing bits.\n");
+                return status;
+        }
+
+        end_jiffies = jiffies +
+                max((unsigned long)1, usecs_to_jiffies(30));
         ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);
 
         do {
@@ -3252,7 +3328,7 @@ static int ql_adapter_down(struct ql_adapter *qdev)
         int i, status = 0;
         struct rx_ring *rx_ring;
 
-        netif_carrier_off(qdev->ndev);
+        ql_link_off(qdev);
 
         /* Don't kill the reset worker thread if we
          * are in the process of recovery.
@@ -3319,8 +3395,12 @@ static int ql_adapter_up(struct ql_adapter *qdev)
         }
         set_bit(QL_ADAPTER_UP, &qdev->flags);
         ql_alloc_rx_buffers(qdev);
-        if ((ql_read32(qdev, STS) & qdev->port_init))
-                netif_carrier_on(qdev->ndev);
+        /* If the port is initialized and the
+         * link is up the turn on the carrier.
+         */
+        if ((ql_read32(qdev, STS) & qdev->port_init) &&
+                        (ql_read32(qdev, STS) & qdev->port_link_up))
+                ql_link_on(qdev);
         ql_enable_interrupts(qdev);
         ql_enable_all_completion_interrupts(qdev);
         netif_tx_start_all_queues(qdev->ndev);
@@ -3346,11 +3426,6 @@ static int ql_get_adapter_resources(struct ql_adapter *qdev)
                 return -ENOMEM;
         }
         status = ql_request_irq(qdev);
-        if (status)
-                goto err_irq;
-        return status;
-err_irq:
-        ql_free_mem_resources(qdev);
         return status;
 }
 
@@ -3414,7 +3489,7 @@ static int ql_configure_rings(struct ql_adapter *qdev)
 
         for (i = 0; i < qdev->tx_ring_count; i++) {
                 tx_ring = &qdev->tx_ring[i];
-                memset((void *)tx_ring, 0, sizeof(tx_ring));
+                memset((void *)tx_ring, 0, sizeof(*tx_ring));
                 tx_ring->qdev = qdev;
                 tx_ring->wq_id = i;
                 tx_ring->wq_len = qdev->tx_ring_size;
@@ -3430,7 +3505,7 @@ static int ql_configure_rings(struct ql_adapter *qdev)
 
         for (i = 0; i < qdev->rx_ring_count; i++) {
                 rx_ring = &qdev->rx_ring[i];
-                memset((void *)rx_ring, 0, sizeof(rx_ring));
+                memset((void *)rx_ring, 0, sizeof(*rx_ring));
                 rx_ring->qdev = qdev;
                 rx_ring->cq_id = i;
                 rx_ring->cpu = i % cpu_cnt;     /* CPU to run handler on. */
@@ -3789,7 +3864,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         int pos, err = 0;
         u16 val16;
 
-        memset((void *)qdev, 0, sizeof(qdev));
+        memset((void *)qdev, 0, sizeof(*qdev));
         err = pci_enable_device(pdev);
         if (err) {
                 dev_err(&pdev->dev, "PCI device enable failed.\n");
@@ -3976,7 +4051,7 @@ static int __devinit qlge_probe(struct pci_dev *pdev,
                 pci_disable_device(pdev);
                 return err;
         }
-        netif_carrier_off(ndev);
+        ql_link_off(qdev);
         ql_display_dev_info(ndev);
         cards_found++;
         return 0;