redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/include/linux/netfilter_ipv4
History
Linus Torvalds cee4cca740 Merge git://git.infradead.org/hdrcleanup-2.6 
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h
 		2006-06-20 15:10:08 -07:00
..
ip_conntrack.h Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
ip_conntrack_amanda.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_conntrack_core.h [NETFILTER]: kill __ip_ct_expect_unlink_destroy 2005-09-06 15:10:46 -07:00
ip_conntrack_ftp.h [NETFILTER]: Add nf_conntrack subsystem. 2005-11-09 16:38:16 -08:00
ip_conntrack_h323.h [NETFILTER]: H.323 helper: Add support for Call Forwarding 2006-06-17 21:29:11 -07:00
ip_conntrack_helper.h [NETFILTER]: Add ctnetlink subsystem 2005-08-29 15:31:49 -07:00
ip_conntrack_helper_h323_asn1.h [NETFILTER]: H.323 helper: Change author's email address 2006-05-03 23:19:59 -07:00
ip_conntrack_helper_h323_types.h [NETFILTER]: H.323 helper: Add support for Call Forwarding 2006-06-17 21:29:11 -07:00
ip_conntrack_icmp.h [NETFILTER]: Add nf_conntrack subsystem. 2005-11-09 16:38:16 -08:00
ip_conntrack_irc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_conntrack_pptp.h [NETFILTER] remove unneeded structure definition from conntrack helper 2005-09-22 23:45:44 -07:00
ip_conntrack_proto_gre.h [NETFILTER]: Add new PPTP conntrack and NAT helper 2005-09-19 15:33:08 -07:00
ip_conntrack_protocol.h [NETFILTER] ctnetlink: allow userspace to change TCP state 2005-10-10 21:23:28 -07:00
ip_conntrack_sctp.h [NETFILTER]: Add nf_conntrack subsystem. 2005-11-09 16:38:16 -08:00
ip_conntrack_sip.h [NETFILTER]: Add SIP connection tracking helper 2006-06-17 21:29:15 -07:00
ip_conntrack_tcp.h [NETFILTER]: Add nf_conntrack subsystem. 2005-11-09 16:38:16 -08:00
ip_conntrack_tftp.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_conntrack_tuple.h [NETFILTER]: Add nf_conntrack subsystem. 2005-11-09 16:38:16 -08:00
ip_nat.h [NETFILTER] NAT sequence adjustment: Save eight bytes per conntrack 2006-03-20 17:14:12 -08:00
ip_nat_core.h [NETFILTER]: Fix invalid module autoloading by splitting iptable_nat 2005-09-26 15:25:11 -07:00
ip_nat_helper.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_nat_pptp.h [NETFILTER]: Add new PPTP conntrack and NAT helper 2005-09-19 15:33:08 -07:00
ip_nat_protocol.h [NETFILTER]: Remove unused function from NAT protocol helpers 2006-01-10 12:54:34 -08:00
ip_nat_rule.h [NETFILTER]: Handle NAT module load race 2005-09-06 15:09:43 -07:00
ip_queue.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ip_tables.h [NETFILTER]: iptables 32bit compat layer 2006-04-01 02:25:19 -08:00
ipt_CLASSIFY.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_CLUSTERIP.h [NETFILTER]: Fix "iptables -D" rule deletion with ipt_CLUSTERIP target. 2005-06-22 12:38:33 -07:00
ipt_CONNMARK.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_DSCP.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_ECN.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_LOG.h [NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibility 2006-02-27 13:04:17 -08:00
ipt_MARK.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_NFQUEUE.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_REJECT.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_SAME.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_TCPMSS.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_TOS.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_TTL.h [NETFILTER]: Add new iptables TTL target 2005-08-29 16:13:22 -07:00
ipt_ULOG.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_addrtype.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_ah.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_comment.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_connbytes.h [NETFILTER]: iptables: fix typos in ipt_connbytes.h 2006-02-04 23:51:22 -08:00
ipt_connmark.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_conntrack.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_dccp.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_dscp.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_ecn.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_esp.h [NETFILTER]: x_tables: unify IPv4/IPv6 esp match 2006-04-01 02:22:30 -08:00
ipt_hashlimit.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_helper.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_iprange.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_length.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_limit.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_mac.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_mark.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_multiport.h [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match 2006-04-01 02:22:54 -08:00
ipt_owner.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_physdev.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_pkttype.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_policy.h [NETFILTER]: x_tables: replace IPv4/IPv6 policy match by address family independant version 2006-03-20 18:03:40 -08:00
ipt_realm.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_recent.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_sctp.h [NETFILTER]: Remove ARRAY_SIZE duplicate 2005-11-20 21:11:31 -08:00
ipt_state.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_string.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_tcpmss.h [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables 2006-01-12 14:06:43 -08:00
ipt_tos.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipt_ttl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
listhelp.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00