diff options
| author |   David L Stevens <david.stevens@oracle.com> | 2015-02-19 13:15:49 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-02-20 17:44:24 -0500 |
| commit | bb39b7433d1c652b3699a7b335e0ad91181b2b05 (patch) | |
| tree | 9ad50479aa75ee459384223e1557f6c2012ad968 /drivers/net/ethernet/sun | |
| parent | bonding: simple code refactor (diff) | |
| download | linux-dev-bb39b7433d1c652b3699a7b335e0ad91181b2b05.tar.xz linux-dev-bb39b7433d1c652b3699a7b335e0ad91181b2b05.zip | |
sunvnet: failed trigger should not cause BUG_ON()
An error return from __vnet_tx_trigger() sets the TX descriptor to
VIO_DESC_FREE while leaving port->tx_bufs[txi].skb set. This leads
to a BUG_ON() the next time this descriptor is used.
This patch frees the pending skb when getting a trigger error to
match the VIO_DESC_FREE state.
Signed-off-by: David L Stevens <david.stevens@oracle.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun')
| -rw-r--r-- | drivers/net/ethernet/sun/sunvnet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 22e0cad1b4b5..401abf7254d3 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -1411,6 +1411,8 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(err < 0)) { netdev_info(dev, "TX trigger error %d\n", err); d->hdr.state = VIO_DESC_FREE; + skb = port->tx_bufs[txi].skb; + port->tx_bufs[txi].skb = NULL; dev->stats.tx_carrier_errors++; goto out_dropped; } |