| Message ID | 52B258A9.70002@huawei.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello, On Thu, 19 Dec 2013, Wang Weidong wrote: > when I built the netfilter, I got that: > net/netfilter/ipvs/ip_vs_sync.c: In function sync_thread_master’: > net/netfilter/ipvs/ip_vs_sync.c:1640: warning: unused variable ‘ret’ There is another patch that we plan to apply but due to possible merge conflict it was delayed: http://marc.info/?t=138426695600002&r=1&w=2 http://marc.info/?t=138426469400008&r=1&w=2 May be it is time to apply it... > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> > --- > net/netfilter/ipvs/ip_vs_sync.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c > index f63c238..d258125 100644 > --- a/net/netfilter/ipvs/ip_vs_sync.c > +++ b/net/netfilter/ipvs/ip_vs_sync.c > @@ -1637,7 +1637,7 @@ static int sync_thread_master(void *data) > continue; > } > while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) { > - int ret = __wait_event_interruptible(*sk_sleep(sk), > + __wait_event_interruptible(*sk_sleep(sk), > sock_writeable(sk) || > kthread_should_stop()); > if (unlikely(kthread_should_stop())) > -- > 1.7.12 Regards -- Julian Anastasov <ja@ssi.bg>
On 2013/12/19 15:17, Julian Anastasov wrote: > > Hello, > > On Thu, 19 Dec 2013, Wang Weidong wrote: > >> when I built the netfilter, I got that: >> net/netfilter/ipvs/ip_vs_sync.c: In function sync_thread_master’: >> net/netfilter/ipvs/ip_vs_sync.c:1640: warning: unused variable ‘ret’ > > There is another patch that we plan to apply but > due to possible merge conflict it was delayed: > > http://marc.info/?t=138426695600002&r=1&w=2 > http://marc.info/?t=138426469400008&r=1&w=2 > > May be it is time to apply it... > Ok, Got it. Regards. Wang >> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> >> --- >> net/netfilter/ipvs/ip_vs_sync.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c >> index f63c238..d258125 100644 >> --- a/net/netfilter/ipvs/ip_vs_sync.c >> +++ b/net/netfilter/ipvs/ip_vs_sync.c >> @@ -1637,7 +1637,7 @@ static int sync_thread_master(void *data) >> continue; >> } >> while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) { >> - int ret = __wait_event_interruptible(*sk_sleep(sk), >> + __wait_event_interruptible(*sk_sleep(sk), >> sock_writeable(sk) || >> kthread_should_stop()); >> if (unlikely(kthread_should_stop())) >> -- >> 1.7.12 > > Regards > > -- > Julian Anastasov <ja@ssi.bg> > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Dec 19, 2013 at 09:17:17AM +0200, Julian Anastasov wrote: > > Hello, > > On Thu, 19 Dec 2013, Wang Weidong wrote: > > > when I built the netfilter, I got that: > > net/netfilter/ipvs/ip_vs_sync.c: In function sync_thread_master’: > > net/netfilter/ipvs/ip_vs_sync.c:1640: warning: unused variable ‘ret’ > > There is another patch that we plan to apply but > due to possible merge conflict it was delayed: > > http://marc.info/?t=138426695600002&r=1&w=2 > http://marc.info/?t=138426469400008&r=1&w=2 > > May be it is time to apply it... Thanks, I have done so. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index f63c238..d258125 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1637,7 +1637,7 @@ static int sync_thread_master(void *data) continue; } while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) { - int ret = __wait_event_interruptible(*sk_sleep(sk), + __wait_event_interruptible(*sk_sleep(sk), sock_writeable(sk) || kthread_should_stop()); if (unlikely(kthread_should_stop()))
when I built the netfilter, I got that: net/netfilter/ipvs/ip_vs_sync.c: In function sync_thread_master’: net/netfilter/ipvs/ip_vs_sync.c:1640: warning: unused variable ‘ret’ Signed-off-by: Wang Weidong <wangweidong1@huawei.com> --- net/netfilter/ipvs/ip_vs_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)