diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 13:15:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 13:15:29 -0400 |
| commit | 8a3ddb88fb0046f2f905ecfdeed6a63c24e66a89 (patch) | |
| tree | c8a060ec39fec58f3231f20b0460fd8ffab8ce71 | |
| parent | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (diff) | |
| parent | b6bf56c6be2be7ccebebfd91b1f11889296cbd9e (diff) | |
Merge tag 'disintegrate-net-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/caif/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/netfilter/Kbuild | 77 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/Kbuild | 4 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 225 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set_bitmap.h | 11 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set_hash.h | 19 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set_list.h | 19 | ||||
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_common.h | 115 | ||||
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_ftp.h | 16 | ||||
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_tcp.h | 49 | ||||
| -rw-r--r-- | include/linux/netfilter/nfnetlink.h | 55 | ||||
| -rw-r--r-- | include/linux/netfilter/nfnetlink_acct.h | 25 | ||||
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 186 | ||||
| -rw-r--r-- | include/linux/netfilter/xt_hashlimit.h | 71 | ||||
| -rw-r--r-- | include/linux/netfilter/xt_physdev.h | 21 | ||||
| -rw-r--r-- | include/linux/netfilter_arp/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 200 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge/Kbuild | 18 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge/ebt_802_3.h | 61 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge/ebtables.h | 255 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/Kbuild | 10 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_tables.h | 218 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/Kbuild | 12 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 256 | ||||
| -rw-r--r-- | include/linux/tc_act/Kbuild | 7 | ||||
| -rw-r--r-- | include/linux/tc_ematch/Kbuild | 4 | ||||
| -rw-r--r-- | include/uapi/linux/caif/Kbuild | 2 | ||||
| -rw-r--r-- | include/uapi/linux/caif/caif_socket.h (renamed from include/linux/caif/caif_socket.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/caif/if_caif.h (renamed from include/linux/caif/if_caif.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/Kbuild | 76 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/Kbuild | 4 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set.h | 231 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 13 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set_hash.h | 21 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set_list.h | 21 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_common.h | 117 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_ftp.h | 18 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_sctp.h (renamed from include/linux/netfilter/nf_conntrack_sctp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_tcp.h | 51 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_tuple_common.h (renamed from include/linux/netfilter/nf_conntrack_tuple_common.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_nat.h (renamed from include/linux/netfilter/nf_nat.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink.h | 56 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_acct.h | 27 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_compat.h (renamed from include/linux/netfilter/nfnetlink_compat.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_conntrack.h (renamed from include/linux/netfilter/nfnetlink_conntrack.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_cthelper.h (renamed from include/linux/netfilter/nfnetlink_cthelper.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_cttimeout.h (renamed from include/linux/netfilter/nfnetlink_cttimeout.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_log.h (renamed from include/linux/netfilter/nfnetlink_log.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink_queue.h (renamed from include/linux/netfilter/nfnetlink_queue.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/x_tables.h | 187 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_AUDIT.h (renamed from include/linux/netfilter/xt_AUDIT.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_CHECKSUM.h (renamed from include/linux/netfilter/xt_CHECKSUM.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_CLASSIFY.h (renamed from include/linux/netfilter/xt_CLASSIFY.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_CONNMARK.h (renamed from include/linux/netfilter/xt_CONNMARK.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_CONNSECMARK.h (renamed from include/linux/netfilter/xt_CONNSECMARK.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_CT.h (renamed from include/linux/netfilter/xt_CT.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_DSCP.h (renamed from include/linux/netfilter/xt_DSCP.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_IDLETIMER.h (renamed from include/linux/netfilter/xt_IDLETIMER.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_LED.h (renamed from include/linux/netfilter/xt_LED.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_LOG.h (renamed from include/linux/netfilter/xt_LOG.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_MARK.h (renamed from include/linux/netfilter/xt_MARK.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_NFLOG.h (renamed from include/linux/netfilter/xt_NFLOG.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_NFQUEUE.h (renamed from include/linux/netfilter/xt_NFQUEUE.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_RATEEST.h (renamed from include/linux/netfilter/xt_RATEEST.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_SECMARK.h (renamed from include/linux/netfilter/xt_SECMARK.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_TCPMSS.h (renamed from include/linux/netfilter/xt_TCPMSS.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h (renamed from include/linux/netfilter/xt_TCPOPTSTRIP.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_TEE.h (renamed from include/linux/netfilter/xt_TEE.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_TPROXY.h (renamed from include/linux/netfilter/xt_TPROXY.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_addrtype.h (renamed from include/linux/netfilter/xt_addrtype.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_cluster.h (renamed from include/linux/netfilter/xt_cluster.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_comment.h (renamed from include/linux/netfilter/xt_comment.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_connbytes.h (renamed from include/linux/netfilter/xt_connbytes.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_connlimit.h (renamed from include/linux/netfilter/xt_connlimit.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_connmark.h (renamed from include/linux/netfilter/xt_connmark.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_conntrack.h (renamed from include/linux/netfilter/xt_conntrack.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_cpu.h (renamed from include/linux/netfilter/xt_cpu.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_dccp.h (renamed from include/linux/netfilter/xt_dccp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_devgroup.h (renamed from include/linux/netfilter/xt_devgroup.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_dscp.h (renamed from include/linux/netfilter/xt_dscp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_ecn.h (renamed from include/linux/netfilter/xt_ecn.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_esp.h (renamed from include/linux/netfilter/xt_esp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_hashlimit.h | 73 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_helper.h (renamed from include/linux/netfilter/xt_helper.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_iprange.h (renamed from include/linux/netfilter/xt_iprange.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_ipvs.h (renamed from include/linux/netfilter/xt_ipvs.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_length.h (renamed from include/linux/netfilter/xt_length.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_limit.h (renamed from include/linux/netfilter/xt_limit.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_mac.h (renamed from include/linux/netfilter/xt_mac.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_mark.h (renamed from include/linux/netfilter/xt_mark.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_multiport.h (renamed from include/linux/netfilter/xt_multiport.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_nfacct.h (renamed from include/linux/netfilter/xt_nfacct.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_osf.h (renamed from include/linux/netfilter/xt_osf.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_owner.h (renamed from include/linux/netfilter/xt_owner.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_physdev.h | 23 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_pkttype.h (renamed from include/linux/netfilter/xt_pkttype.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_policy.h (renamed from include/linux/netfilter/xt_policy.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_quota.h (renamed from include/linux/netfilter/xt_quota.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_rateest.h (renamed from include/linux/netfilter/xt_rateest.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_realm.h (renamed from include/linux/netfilter/xt_realm.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_recent.h (renamed from include/linux/netfilter/xt_recent.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_sctp.h (renamed from include/linux/netfilter/xt_sctp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_set.h (renamed from include/linux/netfilter/xt_set.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_socket.h (renamed from include/linux/netfilter/xt_socket.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_state.h (renamed from include/linux/netfilter/xt_state.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_statistic.h (renamed from include/linux/netfilter/xt_statistic.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_string.h (renamed from include/linux/netfilter/xt_string.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_tcpmss.h (renamed from include/linux/netfilter/xt_tcpmss.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_tcpudp.h (renamed from include/linux/netfilter/xt_tcpudp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_time.h (renamed from include/linux/netfilter/xt_time.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_u32.h (renamed from include/linux/netfilter/xt_u32.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_arp/Kbuild | 2 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_arp/arp_tables.h | 206 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_arp/arpt_mangle.h (renamed from include/linux/netfilter_arp/arpt_mangle.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/Kbuild | 18 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_802_3.h | 62 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_among.h (renamed from include/linux/netfilter_bridge/ebt_among.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_arp.h (renamed from include/linux/netfilter_bridge/ebt_arp.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_arpreply.h (renamed from include/linux/netfilter_bridge/ebt_arpreply.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_ip.h (renamed from include/linux/netfilter_bridge/ebt_ip.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_ip6.h (renamed from include/linux/netfilter_bridge/ebt_ip6.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebt_limit.h (renamed from include/linux/netfilter_bridge/ebt_limit.h) | 0 |