]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
be2net: fix to avoid sending get_stats request if one is already being processed.
authorAjit Khaparde <ajitk@serverengines.com>
Thu, 29 Jul 2010 06:18:58 +0000 (06:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 Jul 2010 06:59:06 +0000 (23:59 -0700)
GET_STATS request uses the same memory region as the response.
If a new request for get stats is fired before the response for
the previous get_stats request is received, the response will
corrupt the new request, causing the f/w to misbehave.

Signed-off-by: Somnath K <somnathk@serverengines.com>
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/benet/be.h
drivers/net/benet/be_cmds.c
drivers/net/benet/be_main.c

index 5e6f581c49d481a4200de54a25b74907349ea983..99197bd54da558ef26cf8a62a54af19aaa02e0f8 100644 (file)
@@ -289,6 +289,7 @@ struct be_adapter {
        u32 rx_fc;              /* Rx flow control */
        u32 tx_fc;              /* Tx flow control */
        bool ue_detected;
+       bool stats_ioctl_sent;
        int link_speed;
        u8 port_type;
        u8 transceiver;
index 7fd860dcbc808b26e0fdbc9a84ee667769bac6cd..3d305494a6066fb987510abebe34a1332f80c114 100644 (file)
@@ -75,6 +75,7 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                        be_dws_le_to_cpu(&resp->hw_stats,
                                                sizeof(resp->hw_stats));
                        netdev_stats_update(adapter);
+                       adapter->stats_ioctl_sent = false;
                }
        } else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
                   (compl->tag0 != OPCODE_COMMON_NTWK_MAC_QUERY)) {
@@ -951,6 +952,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
        sge->len = cpu_to_le32(nonemb_cmd->size);
 
        be_mcc_notify(adapter);
+       adapter->stats_ioctl_sent = true;
 
 err:
        spin_unlock_bh(&adapter->mcc_lock);
index e4a8ae3a1c8d97a12df4e09eb1dbcd0210cbc009..74e146f470c60e9df5ff01806623a0aaaaa0ec82 100644 (file)
@@ -1801,7 +1801,8 @@ static void be_worker(struct work_struct *work)
        struct be_adapter *adapter =
                container_of(work, struct be_adapter, work.work);
 
-       be_cmd_get_stats(adapter, &adapter->stats.cmd);
+       if (!adapter->stats_ioctl_sent)
+               be_cmd_get_stats(adapter, &adapter->stats.cmd);
 
        /* Set EQ delay */
        be_rx_eqd_update(adapter);