* [PATCH net-next] ipv4: remove the unnecessary variable in udp_mcast_next
@ 2014-07-11 6:32 roy.qing.li
2014-07-11 21:08 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: roy.qing.li @ 2014-07-11 6:32 UTC (permalink / raw)
To: netdev
From: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
net/ipv4/udp.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d92f94b..ac30e10 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -600,19 +600,18 @@ static inline struct sock *udp_v4_mcast_next(struct net *net, struct sock *sk,
int dif)
{
struct hlist_nulls_node *node;
- struct sock *s = sk;
unsigned short hnum = ntohs(loc_port);
- sk_nulls_for_each_from(s, node) {
- if (__udp_is_mcast_sock(net, s,
+ sk_nulls_for_each_from(sk, node) {
+ if (__udp_is_mcast_sock(net, sk,
loc_port, loc_addr,
rmt_port, rmt_addr,
dif, hnum))
goto found;
}
- s = NULL;
+ sk = NULL;
found:
- return s;
+ return sk;
}
/*
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] ipv4: remove the unnecessary variable in udp_mcast_next
2014-07-11 6:32 [PATCH net-next] ipv4: remove the unnecessary variable in udp_mcast_next roy.qing.li
@ 2014-07-11 21:08 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-07-11 21:08 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev
From: roy.qing.li@gmail.com
Date: Fri, 11 Jul 2014 14:32:17 +0800
> From: Li RongQing <roy.qing.li@gmail.com>
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-11 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-11 6:32 [PATCH net-next] ipv4: remove the unnecessary variable in udp_mcast_next roy.qing.li
2014-07-11 21:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).