diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-08-03 20:54:15 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-04 01:27:57 -0700 |
| commit | 47061bc440b90a16d856fb0dba1cffc36427efa4 (patch) | |
| tree | 3fcde7efa87537e085013adc5cfa963701557d6d /include/linux/skbuff.h | |
| parent | cc72d100a3f4ba42a9ad02ebe52c0c6c7c496267 (diff) | |
| download | talos-obmc-linux-47061bc440b90a16d856fb0dba1cffc36427efa4.tar.gz talos-obmc-linux-47061bc440b90a16d856fb0dba1cffc36427efa4.zip | |
net: skb_share_check() should use consume_skb()
In order to avoid false drop_monitor indications, we should
call consume_skb() if skb_clone() was successful.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7632c87da2c9..b33a3a1f205e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -846,13 +846,16 @@ static inline int skb_shared(const struct sk_buff *skb) * * NULL is returned on a memory allocation failure. */ -static inline struct sk_buff *skb_share_check(struct sk_buff *skb, - gfp_t pri) +static inline struct sk_buff *skb_share_check(struct sk_buff *skb, gfp_t pri) { might_sleep_if(pri & __GFP_WAIT); if (skb_shared(skb)) { struct sk_buff *nskb = skb_clone(skb, pri); - kfree_skb(skb); + + if (likely(nskb)) + consume_skb(skb); + else + kfree_skb(skb); skb = nskb; } return skb; |
