diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-12 23:27:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-12 23:27:20 -0700 |
| commit | 6ec6f76e4672918a6b267f3614e89da32155aa9c (patch) | |
| tree | 270db74b2177236197e387285a70fbfbf6735587 /include | |
| parent | a3bc528c514f18e307d027bc03c6ef26b9257664 (diff) | |
[NETFILTER]: Teach ip_fw_compat and modules to handle non-linear SKBs.
Much help provided by Rusty Russell in fixing device leak
and TOS modification handling bugs.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter_ipv4/compat_firewall.h | 10 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ipfwadm_core.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/netfilter_ipv4/compat_firewall.h b/include/linux/netfilter_ipv4/compat_firewall.h index ed07ff91c71e..047488a55985 100644 --- a/include/linux/netfilter_ipv4/compat_firewall.h +++ b/include/linux/netfilter_ipv4/compat_firewall.h @@ -21,20 +21,20 @@ struct firewall_ops { struct firewall_ops *next; int (*fw_forward)(struct firewall_ops *this, int pf, - struct net_device *dev, void *phdr, void *arg, + struct net_device *dev, void *arg, struct sk_buff **pskb); int (*fw_input)(struct firewall_ops *this, int pf, - struct net_device *dev, void *phdr, void *arg, + struct net_device *dev, void *arg, struct sk_buff **pskb); int (*fw_output)(struct firewall_ops *this, int pf, - struct net_device *dev, void *phdr, void *arg, + struct net_device *dev, void *arg, struct sk_buff **pskb); /* These may be NULL. */ int (*fw_acct_in)(struct firewall_ops *this, int pf, - struct net_device *dev, void *phdr, void *arg, + struct net_device *dev, void *arg, struct sk_buff **pskb); int (*fw_acct_out)(struct firewall_ops *this, int pf, - struct net_device *dev, void *phdr, void *arg, + struct net_device *dev, void *arg, struct sk_buff **pskb); }; diff --git a/include/linux/netfilter_ipv4/ipfwadm_core.h b/include/linux/netfilter_ipv4/ipfwadm_core.h index 8294efd7e513..8651b77cafa4 100644 --- a/include/linux/netfilter_ipv4/ipfwadm_core.h +++ b/include/linux/netfilter_ipv4/ipfwadm_core.h @@ -250,7 +250,7 @@ extern int ip_masq_ctl(int, void *, int); extern int ip_fw_masq_timeouts(void *user, int len); -extern int ip_fw_chk(struct iphdr *, struct net_device *, __u16 *, +extern int ip_fw_chk(struct sk_buff **, struct net_device *, __u16 *, struct ip_fw *, int, int); #endif /* KERNEL */ #endif /* _IP_FW_H */ |