hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipvs: Remove unused parameter from ip_vs_confirm_conntrack() 

Acked-by: Julian Anastasov <ja@ssi.bg>
Acked-by Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Simon Horman 2011-09-16 14:02:19 +09:00 committed by Pablo Neira Ayuso
parent 7e777dd43d
commit 3c2de2ae02
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/ip_vs.h
View File

@ -1378,7 +1378,7 @@ static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)
extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp,
int outin); int outin);
extern int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp); extern int ip_vs_confirm_conntrack(struct sk_buff *skb);
extern void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct, extern void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct,
struct ip_vs_conn *cp, u_int8_t proto, struct ip_vs_conn *cp, u_int8_t proto,
const __be16 port, int from_rs); const __be16 port, int from_rs);
@ -1396,8 +1396,7 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb,
{ {
} }
static inline int ip_vs_confirm_conntrack(struct sk_buff *skb, static inline int ip_vs_confirm_conntrack(struct sk_buff *skb);
struct ip_vs_conn *cp)
{ {
return NF_ACCEPT; return NF_ACCEPT;
} }

2
net/netfilter/ipvs/ip_vs_nfct.c
View File

@ -127,7 +127,7 @@ ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin)
nf_conntrack_alter_reply(ct, &new_tuple); nf_conntrack_alter_reply(ct, &new_tuple);
} }
int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp) int ip_vs_confirm_conntrack(struct sk_buff *skb)
{ {
return nf_conntrack_confirm(skb); return nf_conntrack_confirm(skb);
} }

2
net/netfilter/ipvs/ip_vs_xmit.c
View File

@ -339,7 +339,7 @@ ip_vs_dst_reset(struct ip_vs_dest *dest)
\ \
(skb)->ipvs_property = 1; \ (skb)->ipvs_property = 1; \
if (unlikely((cp)->flags & IP_VS_CONN_F_NFCT)) \ if (unlikely((cp)->flags & IP_VS_CONN_F_NFCT)) \
__ret = ip_vs_confirm_conntrack(skb, cp); \ __ret = ip_vs_confirm_conntrack(skb); \
if (__ret == NF_ACCEPT) { \ if (__ret == NF_ACCEPT) { \
nf_reset(skb); \ nf_reset(skb); \
skb_forward_csum(skb); \ skb_forward_csum(skb); \