diff --git a/[refs] b/[refs] index 59e4e63d063d..81c80b4af779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59deab26c1974b29b7f501e0ace0673d5acadae1 +refs/heads/master: c63d6ea3060d9e10773e869b1112e3a0efbcf820 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index 0b92f75491b1..ca5276c51804 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -1676,7 +1676,7 @@ static int netlink_dump(struct sock *sk) skb = sock_rmalloc(sk, alloc_size, 0, GFP_KERNEL); if (!skb) - goto errout; + goto errout_skb; len = cb->dump(skb, cb); @@ -1716,7 +1716,6 @@ static int netlink_dump(struct sock *sk) errout_skb: mutex_unlock(nlk->cb_mutex); kfree_skb(skb); -errout: return err; }