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

netfilter: remove unused hooknum arg from packet functions

tested with allmodconfig build.

Signed-off-by: Florian Westphal <fw@strlen.de>

authored by

Florian Westphal and committed by
Pablo Neira Ayuso
d1c1e39d a6912055

+4 -13
-1
include/net/netfilter/nf_conntrack_l4proto.h
··· 43 43 unsigned int dataoff, 44 44 enum ip_conntrack_info ctinfo, 45 45 u_int8_t pf, 46 - unsigned int hooknum, 47 46 unsigned int *timeouts); 48 47 49 48 /* Called when a new connection for this protocol found;
-1
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
··· 82 82 unsigned int dataoff, 83 83 enum ip_conntrack_info ctinfo, 84 84 u_int8_t pf, 85 - unsigned int hooknum, 86 85 unsigned int *timeout) 87 86 { 88 87 /* Do not immediately delete the connection after the first
+2 -4
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
··· 95 95 unsigned int dataoff, 96 96 enum ip_conntrack_info ctinfo, 97 97 u_int8_t pf, 98 - unsigned int hooknum, 99 98 unsigned int *timeout) 100 99 { 101 100 /* Do not immediately delete the connection after the first ··· 128 129 static int 129 130 icmpv6_error_message(struct net *net, struct nf_conn *tmpl, 130 131 struct sk_buff *skb, 131 - unsigned int icmp6off, 132 - unsigned int hooknum) 132 + unsigned int icmp6off) 133 133 { 134 134 struct nf_conntrack_tuple intuple, origtuple; 135 135 const struct nf_conntrack_tuple_hash *h; ··· 212 214 if (icmp6h->icmp6_type >= 128) 213 215 return NF_ACCEPT; 214 216 215 - return icmpv6_error_message(net, tmpl, skb, dataoff, hooknum); 217 + return icmpv6_error_message(net, tmpl, skb, dataoff); 216 218 } 217 219 218 220 #if IS_ENABLED(CONFIG_NF_CT_NETLINK)
+1 -1
net/netfilter/nf_conntrack_core.c
··· 1414 1414 /* Decide what timeout policy we want to apply to this flow. */ 1415 1415 timeouts = nf_ct_timeout_lookup(net, ct, l4proto); 1416 1416 1417 - ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, hooknum, timeouts); 1417 + ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, timeouts); 1418 1418 if (ret <= 0) { 1419 1419 /* Invalid: inverse of the return code tells 1420 1420 * the netfilter core what to do */
+1 -1
net/netfilter/nf_conntrack_proto_dccp.c
··· 469 469 470 470 static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb, 471 471 unsigned int dataoff, enum ip_conntrack_info ctinfo, 472 - u_int8_t pf, unsigned int hooknum, 472 + u_int8_t pf, 473 473 unsigned int *timeouts) 474 474 { 475 475 struct net *net = nf_ct_net(ct);
-1
net/netfilter/nf_conntrack_proto_generic.c
··· 61 61 unsigned int dataoff, 62 62 enum ip_conntrack_info ctinfo, 63 63 u_int8_t pf, 64 - unsigned int hooknum, 65 64 unsigned int *timeout) 66 65 { 67 66 nf_ct_refresh_acct(ct, ctinfo, skb, *timeout);
-1
net/netfilter/nf_conntrack_proto_gre.c
··· 245 245 unsigned int dataoff, 246 246 enum ip_conntrack_info ctinfo, 247 247 u_int8_t pf, 248 - unsigned int hooknum, 249 248 unsigned int *timeouts) 250 249 { 251 250 /* If we've seen traffic both ways, this is a GRE connection.
-1
net/netfilter/nf_conntrack_proto_sctp.c
··· 307 307 unsigned int dataoff, 308 308 enum ip_conntrack_info ctinfo, 309 309 u_int8_t pf, 310 - unsigned int hooknum, 311 310 unsigned int *timeouts) 312 311 { 313 312 enum sctp_conntrack new_state, old_state;
-1
net/netfilter/nf_conntrack_proto_tcp.c
··· 803 803 unsigned int dataoff, 804 804 enum ip_conntrack_info ctinfo, 805 805 u_int8_t pf, 806 - unsigned int hooknum, 807 806 unsigned int *timeouts) 808 807 { 809 808 struct net *net = nf_ct_net(ct);
-1
net/netfilter/nf_conntrack_proto_udp.c
··· 74 74 unsigned int dataoff, 75 75 enum ip_conntrack_info ctinfo, 76 76 u_int8_t pf, 77 - unsigned int hooknum, 78 77 unsigned int *timeouts) 79 78 { 80 79 /* If we've seen traffic both ways, this is some kind of UDP