diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-27 14:59:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-27 14:59:08 -0800 |
| commit | 1397e171f143878dd16ad5f8c99f7b9440cc8911 (patch) | |
| tree | 8aadcac291a2550028950bcaa5d8d0c0d6bedc45 /net/core | |
| parent | 144001bddcb4db62c2261f1d703d835851031577 (diff) | |
| parent | 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962 (diff) | |
| download | linux-3.10-1397e171f143878dd16ad5f8c99f7b9440cc8911.tar.gz linux-3.10-1397e171f143878dd16ad5f8c99f7b9440cc8911.tar.bz2 linux-3.10-1397e171f143878dd16ad5f8c99f7b9440cc8911.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/rtnetlink.c | 3 | ||||
| -rw-r--r-- | net/core/skbuff.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index c668f8c371b..b706271ccb1 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1122,8 +1122,7 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[]) return -EOPNOTSUPP; if (af_ops->validate_link_af) { - err = af_ops->validate_link_af(dev, - tb[IFLA_AF_SPEC]); + err = af_ops->validate_link_af(dev, af); if (err < 0) return err; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a8b1e3c70d2..14cf560b4a3 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, shinfo = skb_shinfo(skb); memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); atomic_set(&shinfo->dataref, 1); + kmemcheck_annotate_variable(shinfo->destructor_arg); if (fclone) { struct sk_buff *child = skb + 1; |