aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/sun/sunvnet.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index b5a1d3d7b0bf..fe044f31708e 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1637,16 +1637,9 @@ static void vnet_port_free_tx_bufs(struct vnet_port *port)
1637 int i; 1637 int i;
1638 1638
1639 dr = &port->vio.drings[VIO_DRIVER_TX_RING]; 1639 dr = &port->vio.drings[VIO_DRIVER_TX_RING];
1640 if (dr->base) { 1640
1641 ldc_free_exp_dring(port->vio.lp, dr->base, 1641 if (dr->base == NULL)
1642 (dr->entry_size * dr->num_entries), 1642 return;
1643 dr->cookies, dr->ncookies);
1644 dr->base = NULL;
1645 dr->entry_size = 0;
1646 dr->num_entries = 0;
1647 dr->pending = 0;
1648 dr->ncookies = 0;
1649 }
1650 1643
1651 for (i = 0; i < VNET_TX_RING_SIZE; i++) { 1644 for (i = 0; i < VNET_TX_RING_SIZE; i++) {
1652 struct vio_net_desc *d; 1645 struct vio_net_desc *d;
@@ -1666,6 +1659,14 @@ static void vnet_port_free_tx_bufs(struct vnet_port *port)
1666 port->tx_bufs[i].skb = NULL; 1659 port->tx_bufs[i].skb = NULL;
1667 d->hdr.state = VIO_DESC_FREE; 1660 d->hdr.state = VIO_DESC_FREE;
1668 } 1661 }
1662 ldc_free_exp_dring(port->vio.lp, dr->base,
1663 (dr->entry_size * dr->num_entries),
1664 dr->cookies, dr->ncookies);
1665 dr->base = NULL;
1666 dr->entry_size = 0;
1667 dr->num_entries = 0;
1668 dr->pending = 0;
1669 dr->ncookies = 0;
1669} 1670}
1670 1671
1671static int vnet_port_alloc_tx_ring(struct vnet_port *port) 1672static int vnet_port_alloc_tx_ring(struct vnet_port *port)