aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/octeon
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2010-05-05 09:03:13 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-06 00:22:35 -0400
commit0294b6f78f2dd9d94fa0deec28e8845a7fb43ac3 (patch)
tree577954a585417a6ecc537df87326917a1b69935a /drivers/net/octeon
parent4e4a4f1478fdb303c9d99c69cfb4e973526f0c99 (diff)
netdev: octeon_mgmt: Remove some gratuitous blank lines.
Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/octeon')
-rw-r--r--drivers/net/octeon/octeon_mgmt.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 1fdc7b303a6b..392470333174 100644
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -380,7 +380,6 @@ done:
380 mix_ircnt.s.ircnt = 1; 380 mix_ircnt.s.ircnt = 1;
381 cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64); 381 cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64);
382 return rc; 382 return rc;
383
384} 383}
385 384
386static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget) 385static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
@@ -390,7 +389,6 @@ static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
390 union cvmx_mixx_ircnt mix_ircnt; 389 union cvmx_mixx_ircnt mix_ircnt;
391 int rc; 390 int rc;
392 391
393
394 mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port)); 392 mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port));
395 while (work_done < budget && mix_ircnt.s.ircnt) { 393 while (work_done < budget && mix_ircnt.s.ircnt) {
396 394
@@ -516,7 +514,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
516 octeon_mgmt_cam_state_add(&cam_state, ha->addr); 514 octeon_mgmt_cam_state_add(&cam_state, ha->addr);
517 } 515 }
518 516
519
520 spin_lock_irqsave(&p->lock, flags); 517 spin_lock_irqsave(&p->lock, flags);
521 518
522 /* Disable packet I/O. */ 519 /* Disable packet I/O. */
@@ -525,7 +522,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
525 agl_gmx_prtx.s.en = 0; 522 agl_gmx_prtx.s.en = 0;
526 cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64); 523 cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64);
527 524
528
529 adr_ctl.u64 = 0; 525 adr_ctl.u64 = 0;
530 adr_ctl.s.cam_mode = cam_mode; 526 adr_ctl.s.cam_mode = cam_mode;
531 adr_ctl.s.mcst = multicast_mode; 527 adr_ctl.s.mcst = multicast_mode;
@@ -928,7 +924,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)
928 924
929 octeon_mgmt_reset_hw(p); 925 octeon_mgmt_reset_hw(p);
930 926
931
932 free_irq(p->irq, netdev); 927 free_irq(p->irq, netdev);
933 928
934 /* dma_unmap is a nop on Octeon, so just free everything. */ 929 /* dma_unmap is a nop on Octeon, so just free everything. */
@@ -945,7 +940,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)
945 DMA_BIDIRECTIONAL); 940 DMA_BIDIRECTIONAL);
946 kfree(p->tx_ring); 941 kfree(p->tx_ring);
947 942
948
949 return 0; 943 return 0;
950} 944}
951 945
@@ -1112,7 +1106,6 @@ static int __init octeon_mgmt_probe(struct platform_device *pdev)
1112 netdev->netdev_ops = &octeon_mgmt_ops; 1106 netdev->netdev_ops = &octeon_mgmt_ops;
1113 netdev->ethtool_ops = &octeon_mgmt_ethtool_ops; 1107 netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;
1114 1108
1115
1116 /* The mgmt ports get the first N MACs. */ 1109 /* The mgmt ports get the first N MACs. */
1117 for (i = 0; i < 6; i++) 1110 for (i = 0; i < 6; i++)
1118 netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i]; 1111 netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i];