tun: use tun_sk instead container_of

[cascardo/linux.git] / drivers / net / cnic.c

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index d4c6e7f..4332b3a 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -1104,6 +1104,8 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
        cp->bnx2x_status_blk = cp->status_blk;
        cp->bnx2x_def_status_blk = cp->ethdev->irq_arr[1].status_blk;
 
+       memset(cp->bnx2x_status_blk, 0, sizeof(struct host_status_block));
+
        cp->l2_rx_ring_size = 15;
 
        ret = cnic_alloc_l2_rings(dev, 4);
@@ -4183,6 +4185,12 @@ static void cnic_shutdown_rings(struct cnic_dev *dev)
                cnic_submit_kwqe_16(dev, RAMROD_CMD_ID_ETH_HALT,
                        BNX2X_ISCSI_L2_CID, ETH_CONNECTION_TYPE, &l5_data);
                msleep(10);
+
+               memset(&l5_data, 0, sizeof(l5_data));
+               cnic_submit_kwqe_16(dev, RAMROD_CMD_ID_ETH_CFC_DEL,
+                       BNX2X_ISCSI_L2_CID, ETH_CONNECTION_TYPE |
+                       (1 << SPE_HDR_COMMON_RAMROD_SHIFT), &l5_data);
+               msleep(10);
        }
 }
 
@@ -4289,6 +4297,9 @@ static void cnic_stop_bnx2x_hw(struct cnic_dev *dev)
                  offsetof(struct cstorm_status_block_c,
                           index_values[HC_INDEX_C_ISCSI_EQ_CONS]),
                  0);
+       CNIC_WR(dev, BAR_CSTRORM_INTMEM +
+               CSTORM_ISCSI_EQ_CONS_OFFSET(cp->func, 0), 0);
+       CNIC_WR16(dev, cp->kcq_io_addr, 0);
        cnic_free_resc(dev);
 }