From 1763e808bf3b0d11f3ca45fa44e32b0f7b0f6925 Mon Sep 17 00:00:00 2001 From: Hal Rosenstock Date: Sat, 13 Aug 2005 20:50:27 -0700 Subject: [PATCH] --- yaml --- r: 6147 b: refs/heads/master c: 92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 h: refs/heads/master i: 6145: 43ecc43be4a5da73a43bf33a9ff5cc56d180273b 6143: 9167c976885a25b5c70cb3fa765105f863166dda v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f9a2b7af9990..a6382bb6ebbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a1d9b7f09aaaacf235656cb32a40ba2c79590b3 +refs/heads/master: 92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index b07383e5c76a..d4300e4a36d8 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -782,15 +782,11 @@ void ipoib_dev_cleanup(struct net_device *dev) ipoib_ib_dev_cleanup(dev); - if (priv->rx_ring) { - kfree(priv->rx_ring); - priv->rx_ring = NULL; - } + kfree(priv->rx_ring); + kfree(priv->tx_ring); - if (priv->tx_ring) { - kfree(priv->tx_ring); - priv->tx_ring = NULL; - } + priv->rx_ring = NULL; + priv->tx_ring = NULL; } static void ipoib_setup(struct net_device *dev)