Commit 59f608d8 authored by sjur.brandeland@stericsson.com's avatar sjur.brandeland@stericsson.com Committed by David S. Miller

caif: Remove bad WARN_ON in caif_dev

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: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3371bb3f
...@@ -146,15 +146,17 @@ void caif_flow_cb(struct sk_buff *skb) ...@@ -146,15 +146,17 @@ void caif_flow_cb(struct sk_buff *skb)
spin_lock_bh(&caifd->flow_lock); spin_lock_bh(&caifd->flow_lock);
send_xoff = caifd->xoff; send_xoff = caifd->xoff;
caifd->xoff = 0; caifd->xoff = 0;
if (!WARN_ON(caifd->xoff_skb_dtor == NULL)) {
WARN_ON(caifd->xoff_skb != skb);
dtor = caifd->xoff_skb_dtor; dtor = caifd->xoff_skb_dtor;
if (WARN_ON(caifd->xoff_skb != skb))
skb = NULL;
caifd->xoff_skb = NULL; caifd->xoff_skb = NULL;
caifd->xoff_skb_dtor = NULL; caifd->xoff_skb_dtor = NULL;
}
spin_unlock_bh(&caifd->flow_lock); spin_unlock_bh(&caifd->flow_lock);
if (dtor) if (dtor && skb)
dtor(skb); dtor(skb);
if (send_xoff) if (send_xoff)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment