Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 05b4b065 authored Oct 26, 2012 by Alan Cox Committed by Pablo Neira Ayuso Oct 28, 2012

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>

parent f019948d

net/netfilter/ipvs/ip_vs_nfct.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ void
	ip_vs_update_conntrack(struct sk_buff skb, struct ip_vs_conn cp, int outin)		ip_vs_update_conntrack(struct sk_buff skb, struct ip_vs_conn cp, int outin)
	{		{
	enum ip_conntrack_info ctinfo;		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;		struct nf_conntrack_tuple new_tuple;

	if (ct == NULL \|\| nf_ct_is_confirmed(ct) \|\| nf_ct_is_untracked(ct) \|\|		if (ct == NULL \|\| nf_ct_is_confirmed(ct) \|\| nf_ct_is_untracked(ct) \|\|

net/netfilter/ipvs/ip_vs_xmit.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -594,7 +594,7 @@ ip_vs_nat_xmit(struct sk_buff skb, struct ip_vs_conn cp,
	#if IS_ENABLED(CONFIG_NF_CONNTRACK)		#if IS_ENABLED(CONFIG_NF_CONNTRACK)
	if (cp->flags & IP_VS_CONN_F_SYNC && local) {		if (cp->flags & IP_VS_CONN_F_SYNC && local) {
	enum ip_conntrack_info ctinfo;		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)) {		if (ct && !nf_ct_is_untracked(ct)) {
	IP_VS_DBG_RL_PKT(10, AF_INET, pp, skb, 0,		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,
	#if IS_ENABLED(CONFIG_NF_CONNTRACK)		#if IS_ENABLED(CONFIG_NF_CONNTRACK)
	if (cp->flags & IP_VS_CONN_F_SYNC && local) {		if (cp->flags & IP_VS_CONN_F_SYNC && local) {
	enum ip_conntrack_info ctinfo;		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)) {		if (ct && !nf_ct_is_untracked(ct)) {
	IP_VS_DBG_RL_PKT(10, AF_INET6, pp, skb, 0,		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,
	#if IS_ENABLED(CONFIG_NF_CONNTRACK)		#if IS_ENABLED(CONFIG_NF_CONNTRACK)
	if (cp->flags & IP_VS_CONN_F_SYNC && local) {		if (cp->flags & IP_VS_CONN_F_SYNC && local) {
	enum ip_conntrack_info ctinfo;		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)) {		if (ct && !nf_ct_is_untracked(ct)) {
	IP_VS_DBG(10, "%s(): "		IP_VS_DBG(10, "%s(): "
	@@ -1356,7 +1356,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff skb, struct ip_vs_conn cp,
	#if IS_ENABLED(CONFIG_NF_CONNTRACK)		#if IS_ENABLED(CONFIG_NF_CONNTRACK)
	if (cp->flags & IP_VS_CONN_F_SYNC && local) {		if (cp->flags & IP_VS_CONN_F_SYNC && local) {
	enum ip_conntrack_info ctinfo;		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)) {		if (ct && !nf_ct_is_untracked(ct)) {
	IP_VS_DBG(10, "%s(): "		IP_VS_DBG(10, "%s(): "