Commit 9c328b05 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by David S. Miller

net: sgi: ioc3-eth: separate tx and rx ring handling

After allocation of descriptor memory is now done once in probe
handling of tx ring is completely done by ioc3_clean_tx_ring. So
we remove the remaining tx ring actions out of ioc3_alloc_rings
and ioc3_free_rings and rename it to ioc3_[alloc|free]_rx_bufs
to better describe what they are doing.
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 489467e5
...@@ -778,12 +778,10 @@ static inline void ioc3_clean_tx_ring(struct ioc3_private *ip) ...@@ -778,12 +778,10 @@ static inline void ioc3_clean_tx_ring(struct ioc3_private *ip)
ip->tx_ci = 0; ip->tx_ci = 0;
} }
static void ioc3_free_rings(struct ioc3_private *ip) static void ioc3_free_rx_bufs(struct ioc3_private *ip)
{ {
int rx_entry, n_entry; int rx_entry, n_entry;
ioc3_clean_tx_ring(ip);
n_entry = ip->rx_ci; n_entry = ip->rx_ci;
rx_entry = ip->rx_pi; rx_entry = ip->rx_pi;
...@@ -794,7 +792,7 @@ static void ioc3_free_rings(struct ioc3_private *ip) ...@@ -794,7 +792,7 @@ static void ioc3_free_rings(struct ioc3_private *ip)
} }
} }
static void ioc3_alloc_rings(struct net_device *dev) static void ioc3_alloc_rx_bufs(struct net_device *dev)
{ {
struct ioc3_private *ip = netdev_priv(dev); struct ioc3_private *ip = netdev_priv(dev);
struct ioc3_erxbuf *rxb; struct ioc3_erxbuf *rxb;
...@@ -824,9 +822,6 @@ static void ioc3_alloc_rings(struct net_device *dev) ...@@ -824,9 +822,6 @@ static void ioc3_alloc_rings(struct net_device *dev)
} }
ip->rx_ci = 0; ip->rx_ci = 0;
ip->rx_pi = RX_BUFFS; ip->rx_pi = RX_BUFFS;
ip->tx_pi = 0;
ip->tx_ci = 0;
} }
static void ioc3_init_rings(struct net_device *dev) static void ioc3_init_rings(struct net_device *dev)
...@@ -835,8 +830,8 @@ static void ioc3_init_rings(struct net_device *dev) ...@@ -835,8 +830,8 @@ static void ioc3_init_rings(struct net_device *dev)
struct ioc3_ethregs *regs = ip->regs; struct ioc3_ethregs *regs = ip->regs;
unsigned long ring; unsigned long ring;
ioc3_free_rings(ip); ioc3_free_rx_bufs(ip);
ioc3_alloc_rings(dev); ioc3_alloc_rx_bufs(dev);
ioc3_clean_tx_ring(ip); ioc3_clean_tx_ring(ip);
...@@ -962,7 +957,9 @@ static int ioc3_close(struct net_device *dev) ...@@ -962,7 +957,9 @@ static int ioc3_close(struct net_device *dev)
ioc3_stop(ip); ioc3_stop(ip);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
ioc3_free_rings(ip); ioc3_free_rx_bufs(ip);
ioc3_clean_tx_ring(ip);
return 0; return 0;
} }
...@@ -1263,12 +1260,11 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1263,12 +1260,11 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
out_stop: out_stop:
ioc3_stop(ip); ioc3_stop(ip);
del_timer_sync(&ip->ioc3_timer); del_timer_sync(&ip->ioc3_timer);
ioc3_free_rings(ip); ioc3_free_rx_bufs(ip);
if (ip->rxr) if (ip->rxr)
free_page((unsigned long)ip->rxr); free_page((unsigned long)ip->rxr);
if (ip->txr) if (ip->txr)
free_pages((unsigned long)ip->txr, 2); free_pages((unsigned long)ip->txr, 2);
kfree(ip->txr);
out_res: out_res:
pci_release_regions(pdev); pci_release_regions(pdev);
out_free: out_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment