]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
liquidio: remove unnecessary code
authorFelix Manlunas <felix.manlunas@cavium.com>
Thu, 12 Jan 2017 01:09:02 +0000 (17:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jan 2017 20:25:24 +0000 (15:25 -0500)
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 <felix.manlunas@cavium.com>
Signed-off-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Satanand Burla <satananda.burla@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/liquidio/lio_main.c

index b8b579d8043fddfa5d26f71185a838a753e6be39..cc825d574e8e17aaa359dc5e14bd7fd4c5dce785 100644 (file)
@@ -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)) {