提交 3c2de2ae 编写于 作者: S Simon Horman 提交者: Pablo Neira Ayuso

ipvs: Remove unused parameter from ip_vs_confirm_conntrack()

Acked-by: NJulian Anastasov <ja@ssi.bg>
Acked-by Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: NSimon Horman <horms@verge.net.au>
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
上级 7e777dd4
...@@ -1378,7 +1378,7 @@ static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs) ...@@ -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, ...@@ -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;
} }
......
...@@ -127,7 +127,7 @@ ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin) ...@@ -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);
} }
......
...@@ -339,7 +339,7 @@ ip_vs_dst_reset(struct ip_vs_dest *dest) ...@@ -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); \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册