From e412b67608b0af4ea8e9695f952dcaf80f34a9af Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 25 Feb 2009 00:34:41 +0000 Subject: [PATCH] --- yaml --- r: 134761 b: refs/heads/master c: 91744f6559393697e13bf0f9f3f35f884e2520f9 h: refs/heads/master i: 134759: 239c1147c2ce1bd0d9ce1ccc7d2e5674de4eea40 v: v3 --- [refs] | 2 +- trunk/net/netlink/af_netlink.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6703193c8966..d3a814113f35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40d44446cf10d9d118e8f0132c94e1f25ea3be97 +refs/heads/master: 91744f6559393697e13bf0f9f3f35f884e2520f9 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index 2760b62dc2c1..e57d700bf6d9 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -1049,8 +1049,7 @@ int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 pid, netlink_unlock_table(); - if (info.skb2) - kfree_skb(info.skb2); + kfree_skb(info.skb2); if (info.delivery_failure) return -ENOBUFS; @@ -1542,8 +1541,7 @@ EXPORT_SYMBOL(netlink_set_nonroot); static void netlink_destroy_callback(struct netlink_callback *cb) { - if (cb->skb) - kfree_skb(cb->skb); + kfree_skb(cb->skb); kfree(cb); }