netfilter: remove unused hooknum arg from packet functions
tested with allmodconfig build. Signed-off-by: Florian Westphal <fw@strlen.de>zero-colors
parent
a691205571
commit
d1c1e39de8
|
@ -43,7 +43,6 @@ struct nf_conntrack_l4proto {
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeouts);
|
unsigned int *timeouts);
|
||||||
|
|
||||||
/* Called when a new connection for this protocol found;
|
/* Called when a new connection for this protocol found;
|
||||||
|
|
|
@ -82,7 +82,6 @@ static int icmp_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeout)
|
unsigned int *timeout)
|
||||||
{
|
{
|
||||||
/* Do not immediately delete the connection after the first
|
/* Do not immediately delete the connection after the first
|
||||||
|
|
|
@ -95,7 +95,6 @@ static int icmpv6_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeout)
|
unsigned int *timeout)
|
||||||
{
|
{
|
||||||
/* Do not immediately delete the connection after the first
|
/* Do not immediately delete the connection after the first
|
||||||
|
@ -129,8 +128,7 @@ static bool icmpv6_new(struct nf_conn *ct, const struct sk_buff *skb,
|
||||||
static int
|
static int
|
||||||
icmpv6_error_message(struct net *net, struct nf_conn *tmpl,
|
icmpv6_error_message(struct net *net, struct nf_conn *tmpl,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
unsigned int icmp6off,
|
unsigned int icmp6off)
|
||||||
unsigned int hooknum)
|
|
||||||
{
|
{
|
||||||
struct nf_conntrack_tuple intuple, origtuple;
|
struct nf_conntrack_tuple intuple, origtuple;
|
||||||
const struct nf_conntrack_tuple_hash *h;
|
const struct nf_conntrack_tuple_hash *h;
|
||||||
|
@ -214,7 +212,7 @@ icmpv6_error(struct net *net, struct nf_conn *tmpl,
|
||||||
if (icmp6h->icmp6_type >= 128)
|
if (icmp6h->icmp6_type >= 128)
|
||||||
return NF_ACCEPT;
|
return NF_ACCEPT;
|
||||||
|
|
||||||
return icmpv6_error_message(net, tmpl, skb, dataoff, hooknum);
|
return icmpv6_error_message(net, tmpl, skb, dataoff);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
|
#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
|
||||||
|
|
|
@ -1414,7 +1414,7 @@ repeat:
|
||||||
/* Decide what timeout policy we want to apply to this flow. */
|
/* Decide what timeout policy we want to apply to this flow. */
|
||||||
timeouts = nf_ct_timeout_lookup(net, ct, l4proto);
|
timeouts = nf_ct_timeout_lookup(net, ct, l4proto);
|
||||||
|
|
||||||
ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, hooknum, timeouts);
|
ret = l4proto->packet(ct, skb, dataoff, ctinfo, pf, timeouts);
|
||||||
if (ret <= 0) {
|
if (ret <= 0) {
|
||||||
/* Invalid: inverse of the return code tells
|
/* Invalid: inverse of the return code tells
|
||||||
* the netfilter core what to do */
|
* the netfilter core what to do */
|
||||||
|
|
|
@ -469,7 +469,7 @@ static unsigned int *dccp_get_timeouts(struct net *net)
|
||||||
|
|
||||||
static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
|
static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
|
||||||
unsigned int dataoff, enum ip_conntrack_info ctinfo,
|
unsigned int dataoff, enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf, unsigned int hooknum,
|
u_int8_t pf,
|
||||||
unsigned int *timeouts)
|
unsigned int *timeouts)
|
||||||
{
|
{
|
||||||
struct net *net = nf_ct_net(ct);
|
struct net *net = nf_ct_net(ct);
|
||||||
|
|
|
@ -61,7 +61,6 @@ static int generic_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeout)
|
unsigned int *timeout)
|
||||||
{
|
{
|
||||||
nf_ct_refresh_acct(ct, ctinfo, skb, *timeout);
|
nf_ct_refresh_acct(ct, ctinfo, skb, *timeout);
|
||||||
|
|
|
@ -245,7 +245,6 @@ static int gre_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeouts)
|
unsigned int *timeouts)
|
||||||
{
|
{
|
||||||
/* If we've seen traffic both ways, this is a GRE connection.
|
/* If we've seen traffic both ways, this is a GRE connection.
|
||||||
|
|
|
@ -307,7 +307,6 @@ static int sctp_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeouts)
|
unsigned int *timeouts)
|
||||||
{
|
{
|
||||||
enum sctp_conntrack new_state, old_state;
|
enum sctp_conntrack new_state, old_state;
|
||||||
|
|
|
@ -803,7 +803,6 @@ static int tcp_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeouts)
|
unsigned int *timeouts)
|
||||||
{
|
{
|
||||||
struct net *net = nf_ct_net(ct);
|
struct net *net = nf_ct_net(ct);
|
||||||
|
|
|
@ -74,7 +74,6 @@ static int udp_packet(struct nf_conn *ct,
|
||||||
unsigned int dataoff,
|
unsigned int dataoff,
|
||||||
enum ip_conntrack_info ctinfo,
|
enum ip_conntrack_info ctinfo,
|
||||||
u_int8_t pf,
|
u_int8_t pf,
|
||||||
unsigned int hooknum,
|
|
||||||
unsigned int *timeouts)
|
unsigned int *timeouts)
|
||||||
{
|
{
|
||||||
/* If we've seen traffic both ways, this is some kind of UDP
|
/* If we've seen traffic both ways, this is some kind of UDP
|
||||||
|
|
Loading…
Reference in New Issue