lkml.org 
[lkml]   [2012]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: sky2: in free_buffers() do proper checks before call of rx_clean()
How about this instead? It moves the rx_clean out of free_buffers and
into the proper place in the unwind code.


--- a/drivers/net/ethernet/marvell/sky2.c 2012-04-12 08:07:11.572640522 -0700
+++ b/drivers/net/ethernet/marvell/sky2.c 2012-04-13 10:19:39.466839378 -0700
@@ -1630,7 +1630,8 @@ static int sky2_alloc_buffers(struct sky
if (!sky2->rx_ring)
goto nomem;

- return sky2_alloc_rx_skbs(sky2);
+ return 0;
+
nomem:
return -ENOMEM;
}
@@ -1639,8 +1640,6 @@ static void sky2_free_buffers(struct sky
{
struct sky2_hw *hw = sky2->hw;

- sky2_rx_clean(sky2);
-
if (sky2->rx_le) {
pci_free_consistent(hw->pdev, RX_LE_BYTES,
sky2->rx_le, sky2->rx_le_map);
@@ -1761,9 +1760,13 @@ static int sky2_open(struct net_device *
if (err)
goto err_out;

+ err = sky2_alloc_rx_skbs(sky2);
+ if (err)
+ goto err_clean;
+
/* With single port, IRQ is setup when device is brought up */
if (hw->ports == 1 && (err = sky2_setup_irq(hw, dev->name)))
- goto err_out;
+ goto err_clean;

sky2_hw_up(sky2);

@@ -1783,6 +1786,8 @@ static int sky2_open(struct net_device *

return 0;

+err_clean:
+ sky2_rx_clean(sky2);
err_out:
sky2_free_buffers(sky2);
return err;
@@ -2158,6 +2163,7 @@ static int sky2_close(struct net_device

sky2_hw_down(sky2);

+ sky2_rx_clean(sky2);
sky2_free_buffers(sky2);

return 0;

\
 
 \ /
  Last update: 2012-04-13 19:27    [W:0.294 / U:23.864 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site