diff options
Diffstat (limited to 'drivers/net/ethernet/renesas/ravb_main.c')
-rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 3cd7989c007d..784782da3a85 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c | |||
@@ -230,18 +230,6 @@ static void ravb_ring_free(struct net_device *ndev, int q) | |||
230 | int ring_size; | 230 | int ring_size; |
231 | int i; | 231 | int i; |
232 | 232 | ||
233 | /* Free RX skb ringbuffer */ | ||
234 | if (priv->rx_skb[q]) { | ||
235 | for (i = 0; i < priv->num_rx_ring[q]; i++) | ||
236 | dev_kfree_skb(priv->rx_skb[q][i]); | ||
237 | } | ||
238 | kfree(priv->rx_skb[q]); | ||
239 | priv->rx_skb[q] = NULL; | ||
240 | |||
241 | /* Free aligned TX buffers */ | ||
242 | kfree(priv->tx_align[q]); | ||
243 | priv->tx_align[q] = NULL; | ||
244 | |||
245 | if (priv->rx_ring[q]) { | 233 | if (priv->rx_ring[q]) { |
246 | for (i = 0; i < priv->num_rx_ring[q]; i++) { | 234 | for (i = 0; i < priv->num_rx_ring[q]; i++) { |
247 | struct ravb_ex_rx_desc *desc = &priv->rx_ring[q][i]; | 235 | struct ravb_ex_rx_desc *desc = &priv->rx_ring[q][i]; |
@@ -270,6 +258,18 @@ static void ravb_ring_free(struct net_device *ndev, int q) | |||
270 | priv->tx_ring[q] = NULL; | 258 | priv->tx_ring[q] = NULL; |
271 | } | 259 | } |
272 | 260 | ||
261 | /* Free RX skb ringbuffer */ | ||
262 | if (priv->rx_skb[q]) { | ||
263 | for (i = 0; i < priv->num_rx_ring[q]; i++) | ||
264 | dev_kfree_skb(priv->rx_skb[q][i]); | ||
265 | } | ||
266 | kfree(priv->rx_skb[q]); | ||
267 | priv->rx_skb[q] = NULL; | ||
268 | |||
269 | /* Free aligned TX buffers */ | ||
270 | kfree(priv->tx_align[q]); | ||
271 | priv->tx_align[q] = NULL; | ||
272 | |||
273 | /* Free TX skb ringbuffer. | 273 | /* Free TX skb ringbuffer. |
274 | * SKBs are freed by ravb_tx_free() call above. | 274 | * SKBs are freed by ravb_tx_free() call above. |
275 | */ | 275 | */ |