aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlcnic
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-05 21:46:26 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-05 21:46:26 -0400
commitd247b6ab3ce6dd43665780865ec5fa145d9ab6bd (patch)
tree02eb71e4d64b678d7568d2b99f309e08f56ef2fe /drivers/net/ethernet/qlogic/qlcnic
parent30f00847953e3aa3f710d62ffd37b42042807900 (diff)
parent4d8fdc95c60e90d84c8257a0067ff4b1729a3757 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic')
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c18
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c10
3 files changed, 19 insertions, 11 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 304e247bdf33..ffbae293cef5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -136,7 +136,7 @@ int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter,
136 rsp = qlcnic_poll_rsp(adapter); 136 rsp = qlcnic_poll_rsp(adapter);
137 137
138 if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) { 138 if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) {
139 dev_err(&pdev->dev, "card response timeout.\n"); 139 dev_err(&pdev->dev, "command timeout, response = 0x%x\n", rsp);
140 cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT; 140 cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT;
141 } else if (rsp == QLCNIC_CDRP_RSP_FAIL) { 141 } else if (rsp == QLCNIC_CDRP_RSP_FAIL) {
142 cmd->rsp.arg[0] = QLCRD32(adapter, QLCNIC_CDRP_ARG(1), &err); 142 cmd->rsp.arg[0] = QLCRD32(adapter, QLCNIC_CDRP_ARG(1), &err);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 1b7f3dbae289..141f116eb868 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -1290,17 +1290,25 @@ static u64 *qlcnic_fill_stats(u64 *data, void *stats, int type)
1290 1290
1291void qlcnic_update_stats(struct qlcnic_adapter *adapter) 1291void qlcnic_update_stats(struct qlcnic_adapter *adapter)
1292{ 1292{
1293 struct qlcnic_tx_queue_stats tx_stats;
1293 struct qlcnic_host_tx_ring *tx_ring; 1294 struct qlcnic_host_tx_ring *tx_ring;
1294 int ring; 1295 int ring;
1295 1296
1297 memset(&tx_stats, 0, sizeof(tx_stats));
1296 for (ring = 0; ring < adapter->drv_tx_rings; ring++) { 1298 for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
1297 tx_ring = &adapter->tx_ring[ring]; 1299 tx_ring = &adapter->tx_ring[ring];
1298 adapter->stats.xmit_on += tx_ring->tx_stats.xmit_on; 1300 tx_stats.xmit_on += tx_ring->tx_stats.xmit_on;
1299 adapter->stats.xmit_off += tx_ring->tx_stats.xmit_off; 1301 tx_stats.xmit_off += tx_ring->tx_stats.xmit_off;
1300 adapter->stats.xmitcalled += tx_ring->tx_stats.xmit_called; 1302 tx_stats.xmit_called += tx_ring->tx_stats.xmit_called;
1301 adapter->stats.xmitfinished += tx_ring->tx_stats.xmit_finished; 1303 tx_stats.xmit_finished += tx_ring->tx_stats.xmit_finished;
1302 adapter->stats.txbytes += tx_ring->tx_stats.tx_bytes; 1304 tx_stats.tx_bytes += tx_ring->tx_stats.tx_bytes;
1303 } 1305 }
1306
1307 adapter->stats.xmit_on = tx_stats.xmit_on;
1308 adapter->stats.xmit_off = tx_stats.xmit_off;
1309 adapter->stats.xmitcalled = tx_stats.xmit_called;
1310 adapter->stats.xmitfinished = tx_stats.xmit_finished;
1311 adapter->stats.txbytes = tx_stats.tx_bytes;
1304} 1312}
1305 1313
1306static u64 *qlcnic_fill_tx_queue_stats(u64 *data, void *stats) 1314static u64 *qlcnic_fill_tx_queue_stats(u64 *data, void *stats)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 0fdbcc8319f7..59846daf1379 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2324,14 +2324,14 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
2324 if (err) 2324 if (err)
2325 return err; 2325 return err;
2326 2326
2327 qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
2328
2327 err = register_netdev(netdev); 2329 err = register_netdev(netdev);
2328 if (err) { 2330 if (err) {
2329 dev_err(&pdev->dev, "failed to register net device\n"); 2331 dev_err(&pdev->dev, "failed to register net device\n");
2330 return err; 2332 return err;
2331 } 2333 }
2332 2334
2333 qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
2334
2335 return 0; 2335 return 0;
2336} 2336}
2337 2337
@@ -2624,13 +2624,13 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2624 if (err) 2624 if (err)
2625 goto err_out_disable_mbx_intr; 2625 goto err_out_disable_mbx_intr;
2626 2626
2627 if (adapter->portnum == 0)
2628 qlcnic_set_drv_version(adapter);
2629
2627 err = qlcnic_setup_netdev(adapter, netdev, pci_using_dac); 2630 err = qlcnic_setup_netdev(adapter, netdev, pci_using_dac);
2628 if (err) 2631 if (err)
2629 goto err_out_disable_mbx_intr; 2632 goto err_out_disable_mbx_intr;
2630 2633
2631 if (adapter->portnum == 0)
2632 qlcnic_set_drv_version(adapter);
2633
2634 pci_set_drvdata(pdev, adapter); 2634 pci_set_drvdata(pdev, adapter);
2635 2635
2636 if (qlcnic_82xx_check(adapter)) 2636 if (qlcnic_82xx_check(adapter))
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-11 07:51:36 -0400