* [PATCH] netfilter: remove silly double assignment
@ 2012-10-26 10:13 Alan Cox
2012-10-28 22:53 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Alan Cox @ 2012-10-26 10:13 UTC (permalink / raw)
To: netfilter-devel
From: Alan Cox <alan@linux.intel.com>
I don't even want to think what the C spec says for this 8)
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
net/netfilter/ipvs/ip_vs_nfct.c | 2 +-
net/netfilter/ipvs/ip_vs_xmit.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
index 022e77e..c8beafd 100644
--- a/net/netfilter/ipvs/ip_vs_nfct.c
+++ b/net/netfilter/ipvs/ip_vs_nfct.c
@@ -82,7 +82,7 @@ void
ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin)
{
enum ip_conntrack_info ctinfo;
- struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
struct nf_conntrack_tuple new_tuple;
if (ct == NULL || nf_ct_is_confirmed(ct) || nf_ct_is_untracked(ct) ||
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index cc4c809..d8ce87a 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -592,7 +592,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
if (cp->flags & IP_VS_CONN_F_SYNC && local) {
enum ip_conntrack_info ctinfo;
- struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
if (ct && !nf_ct_is_untracked(ct)) {
IP_VS_DBG_RL_PKT(10, AF_INET, pp, skb, 0,
@@ -709,7 +709,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
if (cp->flags & IP_VS_CONN_F_SYNC && local) {
enum ip_conntrack_info ctinfo;
- struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
if (ct && !nf_ct_is_untracked(ct)) {
IP_VS_DBG_RL_PKT(10, AF_INET6, pp, skb, 0,
@@ -1227,7 +1227,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
if (cp->flags & IP_VS_CONN_F_SYNC && local) {
enum ip_conntrack_info ctinfo;
- struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
if (ct && !nf_ct_is_untracked(ct)) {
IP_VS_DBG(10, "%s(): "
@@ -1347,7 +1347,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
if (cp->flags & IP_VS_CONN_F_SYNC && local) {
enum ip_conntrack_info ctinfo;
- struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
if (ct && !nf_ct_is_untracked(ct)) {
IP_VS_DBG(10, "%s(): "
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] netfilter: remove silly double assignment
2012-10-26 10:13 [PATCH] netfilter: remove silly double assignment Alan Cox
@ 2012-10-28 22:53 ` Pablo Neira Ayuso
2012-10-29 1:21 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2012-10-28 22:53 UTC (permalink / raw)
To: Alan Cox; +Cc: netfilter-devel, Simon Horman
On Fri, Oct 26, 2012 at 11:13:27AM +0100, Alan Cox wrote:
> From: Alan Cox <alan@linux.intel.com>
>
> I don't even want to think what the C spec says for this 8)
I don't want to know it either :-), I have applied this.
@Simon: this patch is fairly small, I'll take it myself into nf-next.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: remove silly double assignment
2012-10-28 22:53 ` Pablo Neira Ayuso
@ 2012-10-29 1:21 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-10-29 1:21 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Alan Cox, netfilter-devel
On Sun, Oct 28, 2012 at 11:53:49PM +0100, Pablo Neira Ayuso wrote:
> On Fri, Oct 26, 2012 at 11:13:27AM +0100, Alan Cox wrote:
> > From: Alan Cox <alan@linux.intel.com>
> >
> > I don't even want to think what the C spec says for this 8)
>
> I don't want to know it either :-), I have applied this.
>
> @Simon: this patch is fairly small, I'll take it myself into nf-next.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-29 1:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-26 10:13 [PATCH] netfilter: remove silly double assignment Alan Cox
2012-10-28 22:53 ` Pablo Neira Ayuso
2012-10-29 1:21 ` Simon Horman
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).