diff options
| author | Felix Manlunas <[email protected]> | 2017-01-12 01:09:02 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-01-12 20:25:24 +0000 |
| commit | cb2336b5965d95d03e46d145d5e11aea4eaab0ad (patch) | |
| tree | 06a253068a4dd8f9bdfaea55627142b26ea52e64 | |
| parent | tilepro: Fix non-void return from void function (diff) | |
| download | kernel-cb2336b5965d95d03e46d145d5e11aea4eaab0ad.tar.gz kernel-cb2336b5965d95d03e46d145d5e11aea4eaab0ad.zip | |
liquidio: remove unnecessary code
Remove code that's no longer needed. It used to serve a purpose, which was
to fix a link-related bug. For a while now, the NIC firmware has had a
more elegant fix for that bug.
Signed-off-by: Felix Manlunas <[email protected]>
Signed-off-by: Derek Chickles <[email protected]>
Signed-off-by: Satanand Burla <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index b8b579d8043f..cc825d574e8e 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2693,13 +2693,7 @@ static int liquidio_stop(struct net_device *netdev) lio->linfo.link.s.link_up = 0; lio->link_changes++; - /* Pause for a moment and wait for Octeon to flush out (to the wire) any - * egress packets that are in-flight. - */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(msecs_to_jiffies(100)); - - /* Now it should be safe to tell Octeon that nic interface is down. */ + /* Tell Octeon that nic interface is down. */ send_rx_ctrl_cmd(lio, 0); if (OCTEON_CN23XX_PF(oct)) { |