]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
caif: Remove bad WARN_ON in caif_dev
authorsjur.brandeland@stericsson.com <sjur.brandeland@stericsson.com>
Tue, 17 Jan 2012 03:03:14 +0000 (03:03 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Jan 2012 15:46:55 +0000 (10:46 -0500)
Remove WARN_ON and bad handling of SKB without destructor callback
in caif_flow_cb. SKB without destructor cannot be handled as an
error case.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/caif/caif_dev.c

index 61570ee76fe6eca7824431663917a32827c90c9b..673728add60bf878c7b582a770bf2f3a48dc69bf 100644 (file)
@@ -146,15 +146,17 @@ void caif_flow_cb(struct sk_buff *skb)
        spin_lock_bh(&caifd->flow_lock);
        send_xoff = caifd->xoff;
        caifd->xoff = 0;
-       if (!WARN_ON(caifd->xoff_skb_dtor == NULL)) {
-               WARN_ON(caifd->xoff_skb != skb);
-               dtor = caifd->xoff_skb_dtor;
-               caifd->xoff_skb = NULL;
-               caifd->xoff_skb_dtor = NULL;
-       }
+       dtor = caifd->xoff_skb_dtor;
+
+       if (WARN_ON(caifd->xoff_skb != skb))
+               skb = NULL;
+
+       caifd->xoff_skb = NULL;
+       caifd->xoff_skb_dtor = NULL;
+
        spin_unlock_bh(&caifd->flow_lock);
 
-       if (dtor)
+       if (dtor && skb)
                dtor(skb);
 
        if (send_xoff)