Hi Dave,
following a few netfilter fixes for 2.6.19, fixing invalid use of skb_trim
in netfilter userspace queueing, conflicting optname values for ip6tables
revision support and another byteorder problem in nfnetlink_log.
Please apply, thanks.
include/linux/in6.h | 12 +++++++++++-
include/linux/netfilter/x_tables.h | 16 ----------------
include/linux/netfilter_arp/arp_tables.h | 25 +++++++++++++------------
include/linux/netfilter_ipv4/ip_tables.h | 27 +++++++++++++++------------
include/linux/netfilter_ipv6/ip6_tables.h | 27 +++++++++++++++------------
net/ipv4/netfilter/ip_queue.c | 7 ++++---
net/ipv6/netfilter/ip6_queue.c | 7 ++++---
net/ipv6/netfilter/ip6_tables.c | 2 +-
net/netfilter/nfnetlink_log.c | 2 +-
net/netfilter/nfnetlink_queue.c | 7 ++++---
10 files changed, 68 insertions(+), 64 deletions(-)
Patrick McHardy:
[NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL
[NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue
[NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
Yasuyuki Kozakai:
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
following a few netfilter fixes for 2.6.19, fixing invalid use of skb_trim
in netfilter userspace queueing, conflicting optname values for ip6tables
revision support and another byteorder problem in nfnetlink_log.
Please apply, thanks.
include/linux/in6.h | 12 +++++++++++-
include/linux/netfilter/x_tables.h | 16 ----------------
include/linux/netfilter_arp/arp_tables.h | 25 +++++++++++++------------
include/linux/netfilter_ipv4/ip_tables.h | 27 +++++++++++++++------------
include/linux/netfilter_ipv6/ip6_tables.h | 27 +++++++++++++++------------
net/ipv4/netfilter/ip_queue.c | 7 ++++---
net/ipv6/netfilter/ip6_queue.c | 7 ++++---
net/ipv6/netfilter/ip6_tables.c | 2 +-
net/netfilter/nfnetlink_log.c | 2 +-
net/netfilter/nfnetlink_queue.c | 7 ++++---
10 files changed, 68 insertions(+), 64 deletions(-)
Patrick McHardy:
[NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL
[NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue
[NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
Yasuyuki Kozakai:
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt