diff options
| author | Thomas Falcon | 2017-05-26 16:30:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-05-26 21:32:45 +0200 |
| commit | b8c80b8413eec7ae154cdad692a7fd1cb32d0370 (patch) | |
| tree | 398178ab51f81d8ea65808d8081e6c4c1b43d846 /drivers/net | |
| parent | ibmvnic: Non-fatal error handling (diff) | |
| download | kernel-qcow2-linux-b8c80b8413eec7ae154cdad692a7fd1cb32d0370.tar.gz kernel-qcow2-linux-b8c80b8413eec7ae154cdad692a7fd1cb32d0370.tar.xz kernel-qcow2-linux-b8c80b8413eec7ae154cdad692a7fd1cb32d0370.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index def867aaa422..1c3f1edea9db 100644 --- 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++; |