]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
sunvnet: remove unused variable in maybe_tx_wakeup
authorSowmini Varadhan <sowmini.varadhan@oracle.com>
Mon, 13 Feb 2017 18:56:58 +0000 (10:56 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 6 Apr 2017 07:13:50 +0000 (00:13 -0700)
The vio_dring_state *dr variable is unused in maybe_tx_wakeup().
As the comments indicate, we call maybe_tx_wakeup() whenever we
get a STOPPED LDC message on the port. If the queue is stopped,
we want to wake it up so that we will send another START message
at the next TX and trigger the consumer to drain the dring.

Orabug: 23293104

Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit d4aa89cc2bbe021722c946eb11b21ebb0f13c825)
Signed-off-by: Allen Pais <allen.pais@oracle.com>
drivers/net/ethernet/sun/sunvnet_common.c

index fd2170150ba1242dda3f968dc16235b7afc94365..170d866ea5d8c303644174da44f881181ca05602 100644 (file)
@@ -719,12 +719,8 @@ static void maybe_tx_wakeup(struct vnet_port *port)
        txq = netdev_get_tx_queue(VNET_PORT_TO_NET_DEVICE(port),
                                  port->q_index);
        __netif_tx_lock(txq, smp_processor_id());
-       if (likely(netif_tx_queue_stopped(txq))) {
-               struct vio_dring_state *dr;
-
-               dr = &port->vio.drings[VIO_DRIVER_TX_RING];
+       if (likely(netif_tx_queue_stopped(txq)))
                netif_tx_wake_queue(txq);
-       }
        __netif_tx_unlock(txq);
 }