diff options
author | Alan Cox <alan@linux.intel.com> | 2012-10-25 20:13:27 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-10-28 17:50:51 -0400 |
commit | 05b4b065a06c3ebacc23ff188e15ea7a278eadc0 (patch) | |
tree | 4a595f208539d2432e25977c8401e9fb74124f03 /net/netfilter | |
parent | f019948dbb388eacbc0fb61db1d30e686224df77 (diff) |
ipvs: remove silly double assignment
I don't even want to think what the C spec says for this 8)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_nfct.c | 2 | ||||
-rw-r--r-- | 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 022e77e1e766..c8beafd401aa 100644 --- a/net/netfilter/ipvs/ip_vs_nfct.c +++ b/net/netfilter/ipvs/ip_vs_nfct.c | |||
@@ -82,7 +82,7 @@ void | |||
82 | ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin) | 82 | ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin) |
83 | { | 83 | { |
84 | enum ip_conntrack_info ctinfo; | 84 | enum ip_conntrack_info ctinfo; |
85 | struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo); | 85 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
86 | struct nf_conntrack_tuple new_tuple; | 86 | struct nf_conntrack_tuple new_tuple; |
87 | 87 | ||
88 | if (ct == NULL || nf_ct_is_confirmed(ct) || nf_ct_is_untracked(ct) || | 88 | 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 12008b47e5ca..ee6b7a9f1ec2 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c | |||
@@ -594,7 +594,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
594 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 594 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
595 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { | 595 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { |
596 | enum ip_conntrack_info ctinfo; | 596 | enum ip_conntrack_info ctinfo; |
597 | struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo); | 597 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
598 | 598 | ||
599 | if (ct && !nf_ct_is_untracked(ct)) { | 599 | if (ct && !nf_ct_is_untracked(ct)) { |
600 | IP_VS_DBG_RL_PKT(10, AF_INET, pp, skb, 0, | 600 | IP_VS_DBG_RL_PKT(10, AF_INET, pp, skb, 0, |
@@ -710,7 +710,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
710 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 710 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
711 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { | 711 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { |
712 | enum ip_conntrack_info ctinfo; | 712 | enum ip_conntrack_info ctinfo; |
713 | struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo); | 713 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
714 | 714 | ||
715 | if (ct && !nf_ct_is_untracked(ct)) { | 715 | if (ct && !nf_ct_is_untracked(ct)) { |
716 | IP_VS_DBG_RL_PKT(10, AF_INET6, pp, skb, 0, | 716 | IP_VS_DBG_RL_PKT(10, AF_INET6, pp, skb, 0, |
@@ -1235,7 +1235,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
1235 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 1235 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
1236 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { | 1236 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { |
1237 | enum ip_conntrack_info ctinfo; | 1237 | enum ip_conntrack_info ctinfo; |
1238 | struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo); | 1238 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
1239 | 1239 | ||
1240 | if (ct && !nf_ct_is_untracked(ct)) { | 1240 | if (ct && !nf_ct_is_untracked(ct)) { |
1241 | IP_VS_DBG(10, "%s(): " | 1241 | IP_VS_DBG(10, "%s(): " |
@@ -1356,7 +1356,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
1356 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 1356 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
1357 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { | 1357 | if (cp->flags & IP_VS_CONN_F_SYNC && local) { |
1358 | enum ip_conntrack_info ctinfo; | 1358 | enum ip_conntrack_info ctinfo; |
1359 | struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo); | 1359 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
1360 | 1360 | ||
1361 | if (ct && !nf_ct_is_untracked(ct)) { | 1361 | if (ct && !nf_ct_is_untracked(ct)) { |
1362 | IP_VS_DBG(10, "%s(): " | 1362 | IP_VS_DBG(10, "%s(): " |