diff options
| author | Wang Yufen <wangyufen@huawei.com> | 2014-02-17 16:53:35 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-17 16:57:29 -0500 |
| commit | cb6e926e3f734f0934d3cb5cd7c827158183d367 (patch) | |
| tree | e0ecc64805b6525472aaee4261e865f12920e153 | |
| parent | 1c8669e0f6b3bda7c8ebfb36b0682e4261d8bba8 (diff) | |
| download | op-kernel-dev-cb6e926e3f734f0934d3cb5cd7c827158183d367.zip op-kernel-dev-cb6e926e3f734f0934d3cb5cd7c827158183d367.tar.gz | |
ipv6:fix checkpatch errors with assignment in if condition
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/addrlabel.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index d702406..731e1e1 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c @@ -504,12 +504,13 @@ static int ip6addrlbl_dump(struct sk_buff *skb, struct netlink_callback *cb) hlist_for_each_entry_rcu(p, &ip6addrlbl_table.head, list) { if (idx >= s_idx && net_eq(ip6addrlbl_net(p), net)) { - if ((err = ip6addrlbl_fill(skb, p, - ip6addrlbl_table.seq, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, - RTM_NEWADDRLABEL, - NLM_F_MULTI)) <= 0) + err = ip6addrlbl_fill(skb, p, + ip6addrlbl_table.seq, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, + RTM_NEWADDRLABEL, + NLM_F_MULTI); + if (err <= 0) break; } idx++; @@ -567,7 +568,8 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh) goto out; } - if (!(skb = nlmsg_new(ip6addrlbl_msgsize(), GFP_KERNEL))) { + skb = nlmsg_new(ip6addrlbl_msgsize(), GFP_KERNEL); + if (!skb) { ip6addrlbl_put(p); return -ENOBUFS; } |
