Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd

[karo-tx-linux.git] / net / caif / caif_dev.c

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 366ca0fb7a29f1a2cc71697e766a9123a50d4c63..682c0fedf360c3f87177439f3a35e01e18daac18 100644 (file)
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -142,6 +142,7 @@ static int receive(struct sk_buff *skb, struct net_device *dev,
 {
        struct cfpkt *pkt;
        struct caif_device_entry *caifd;
+       int err;
 
        pkt = cfpkt_fromnative(CAIF_DIR_IN, skb);
 
@@ -159,7 +160,11 @@ static int receive(struct sk_buff *skb, struct net_device *dev,
        caifd_hold(caifd);
        rcu_read_unlock();
 
-       caifd->layer.up->receive(caifd->layer.up, pkt);
+       err = caifd->layer.up->receive(caifd->layer.up, pkt);
+
+       /* For -EILSEQ the packet is not freed so so it now */
+       if (err == -EILSEQ)
+               cfpkt_destroy(pkt);
 
        /* Release reference to stack upwards */
        caifd_put(caifd);