ibmvnic: Halt TX and report carrier off on H_CLOSED return code

This patch disables transmissions and reports carrier off if xmit
function returns that the hardware TX queue is closed. The driver can
then await a signal from firmware to determine the correct reset method.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index def867aaa42284f57620c80fcba1b388e5697b29..1c3f1edea9db8dc5adf519f1f267502c77f373a9 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1111,8 +1111,14 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
                dev_kfree_skb_any(skb);
                tx_buff->skb = NULL;
 
-               if (lpar_rc == H_CLOSED)
-                       netif_stop_subqueue(netdev, queue_num);
+               if (lpar_rc == H_CLOSED) {
+                       /* Disable TX and report carrier off if queue is closed.
+                        * Firmware guarantees that a signal will be sent to the
+                        * driver, triggering a reset or some other action.
+                        */
+                       netif_tx_stop_all_queues(netdev);
+                       netif_carrier_off(netdev);
+               }
 
                tx_send_failed++;
                tx_dropped++;