Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Simon Horman and committed by
Pablo Neira Ayuso
3c2de2ae 7e777dd4

+4 -5
+2 -3
include/net/ip_vs.h
··· 1378 1378 1379 1379 extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, 1380 1380 int outin); 1381 - extern int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp); 1381 + extern int ip_vs_confirm_conntrack(struct sk_buff *skb); 1382 1382 extern void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct, 1383 1383 struct ip_vs_conn *cp, u_int8_t proto, 1384 1384 const __be16 port, int from_rs); ··· 1396 1396 { 1397 1397 } 1398 1398 1399 - static inline int ip_vs_confirm_conntrack(struct sk_buff *skb, 1400 - struct ip_vs_conn *cp) 1399 + static inline int ip_vs_confirm_conntrack(struct sk_buff *skb); 1401 1400 { 1402 1401 return NF_ACCEPT; 1403 1402 }
+1 -1
net/netfilter/ipvs/ip_vs_nfct.c
··· 127 127 nf_conntrack_alter_reply(ct, &new_tuple); 128 128 } 129 129 130 - int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp) 130 + int ip_vs_confirm_conntrack(struct sk_buff *skb) 131 131 { 132 132 return nf_conntrack_confirm(skb); 133 133 }
+1 -1
net/netfilter/ipvs/ip_vs_xmit.c
··· 339 339 \ 340 340 (skb)->ipvs_property = 1; \ 341 341 if (unlikely((cp)->flags & IP_VS_CONN_F_NFCT)) \ 342 - __ret = ip_vs_confirm_conntrack(skb, cp); \ 342 + __ret = ip_vs_confirm_conntrack(skb); \ 343 343 if (__ret == NF_ACCEPT) { \ 344 344 nf_reset(skb); \ 345 345 skb_forward_csum(skb); \