diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-27 17:59:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-27 17:59:08 -0500 |
| commit | 1397e171f143878dd16ad5f8c99f7b9440cc8911 (patch) | |
| tree | 8aadcac291a2550028950bcaa5d8d0c0d6bedc45 /net/core/skbuff.c | |
| parent | 144001bddcb4db62c2261f1d703d835851031577 (diff) | |
| parent | 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a8b1e3c70d23..14cf560b4a3e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -210,6 +210,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, | |||
| 210 | shinfo = skb_shinfo(skb); | 210 | shinfo = skb_shinfo(skb); |
| 211 | memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); | 211 | memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); |
| 212 | atomic_set(&shinfo->dataref, 1); | 212 | atomic_set(&shinfo->dataref, 1); |
| 213 | kmemcheck_annotate_variable(shinfo->destructor_arg); | ||
| 213 | 214 | ||
| 214 | if (fclone) { | 215 | if (fclone) { |
| 215 | struct sk_buff *child = skb + 1; | 216 | struct sk_buff *child = skb + 1; |