From: Sowmini Varadhan Date: Mon, 13 Feb 2017 18:56:58 +0000 (-0800) Subject: sunvnet: remove unused variable in maybe_tx_wakeup X-Git-Tag: v4.1.12-98.0.20170517_2143~37^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f0204b2ba0ca4f6148ec31db85d33147c26cca28;p=users%2Fjedix%2Flinux-maple.git sunvnet: remove unused variable in maybe_tx_wakeup 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 Signed-off-by: Shannon Nelson Signed-off-by: David S. Miller (cherry picked from commit d4aa89cc2bbe021722c946eb11b21ebb0f13c825) Signed-off-by: Allen Pais --- diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index fd2170150ba12..170d866ea5d8c 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -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); }