From baa85e7e8c01cffe45c11affbd974b916b4c9a1a Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Fri, 16 Feb 2007 00:16:13 +0200 Subject: [PATCH] --- yaml --- r: 48795 b: refs/heads/master c: 8a2e65f87c66ab1e720f49378750cdd800f9e9cf h: refs/heads/master i: 48793: a058c8ac86c871612df6f46fa49a01a3e7a7c8db 48791: bac050be4eb53059e02d93806daa88ae8cf938d8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53093ae67351..127ddfa40ebb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c52daa29760818772ee4211be4ee8d1c78b888d5 +refs/heads/master: 8a2e65f87c66ab1e720f49378750cdd800f9e9cf diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 8881a717e9da..4d59682f7d4a 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -145,7 +145,7 @@ static int ipoib_cm_alloc_rx_skb(struct net_device *dev, int id, for (; i >= 0; --i) ib_dma_unmap_single(priv->ca, mapping[i + 1], PAGE_SIZE, DMA_FROM_DEVICE); - kfree_skb(skb); + dev_kfree_skb_any(skb); return -ENOMEM; }