Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[deliverable/linux.git] / drivers / net / rionet.c

diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index a6fd27a2cc3d25b4808ae5c85ba8c7a8e6e9da4b..ec59e29807a67ad94a79ded9d2487856ae436ec9 100644 (file)
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -362,8 +362,7 @@ static int rionet_close(struct net_device *ndev)
        netif_carrier_off(ndev);
 
        for (i = 0; i < RIONET_RX_RING_SIZE; i++)
-               if (rnet->rx_skb[i])
-                       kfree_skb(rnet->rx_skb[i]);
+               kfree_skb(rnet->rx_skb[i]);
 
        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
                if (rionet_active[peer->rdev->destid]) {