tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'master' of git://dev.medozas.de/linux

Patrick McHardy a8fc0d9b 94b27cc3

+133 -125
+2
include/linux/netfilter/Kbuild
··· 56 56 header-y += xt_realm.h 57 57 header-y += xt_recent.h 58 58 header-y += xt_sctp.h 59 + header-y += xt_secmark.h 60 + header-y += xt_socket.h 59 61 header-y += xt_state.h 60 62 header-y += xt_statistic.h 61 63 header-y += xt_string.h
+12 -12
include/linux/netfilter_bridge/ebt_802_3.h
··· 24 24 25 25 /* ui has one byte ctrl, ni has two */ 26 26 struct hdr_ui { 27 - uint8_t dsap; 28 - uint8_t ssap; 29 - uint8_t ctrl; 30 - uint8_t orig[3]; 27 + __u8 dsap; 28 + __u8 ssap; 29 + __u8 ctrl; 30 + __u8 orig[3]; 31 31 __be16 type; 32 32 }; 33 33 34 34 struct hdr_ni { 35 - uint8_t dsap; 36 - uint8_t ssap; 35 + __u8 dsap; 36 + __u8 ssap; 37 37 __be16 ctrl; 38 - uint8_t orig[3]; 38 + __u8 orig[3]; 39 39 __be16 type; 40 40 }; 41 41 42 42 struct ebt_802_3_hdr { 43 - uint8_t daddr[6]; 44 - uint8_t saddr[6]; 43 + __u8 daddr[6]; 44 + __u8 saddr[6]; 45 45 __be16 len; 46 46 union { 47 47 struct hdr_ui ui; ··· 59 59 #endif 60 60 61 61 struct ebt_802_3_info { 62 - uint8_t sap; 62 + __u8 sap; 63 63 __be16 type; 64 - uint8_t bitmask; 65 - uint8_t invflags; 64 + __u8 bitmask; 65 + __u8 invflags; 66 66 }; 67 67 68 68 #endif
+1 -1
include/linux/netfilter_bridge/ebt_among.h
··· 30 30 */ 31 31 32 32 struct ebt_mac_wormhash_tuple { 33 - uint32_t cmp[2]; 33 + __u32 cmp[2]; 34 34 __be32 ip; 35 35 }; 36 36
+2 -2
include/linux/netfilter_bridge/ebt_arp.h
··· 27 27 unsigned char smmsk[ETH_ALEN]; 28 28 unsigned char dmaddr[ETH_ALEN]; 29 29 unsigned char dmmsk[ETH_ALEN]; 30 - uint8_t bitmask; 31 - uint8_t invflags; 30 + __u8 bitmask; 31 + __u8 invflags; 32 32 }; 33 33 34 34 #endif
+6 -6
include/linux/netfilter_bridge/ebt_ip.h
··· 31 31 __be32 daddr; 32 32 __be32 smsk; 33 33 __be32 dmsk; 34 - uint8_t tos; 35 - uint8_t protocol; 36 - uint8_t bitmask; 37 - uint8_t invflags; 38 - uint16_t sport[2]; 39 - uint16_t dport[2]; 34 + __u8 tos; 35 + __u8 protocol; 36 + __u8 bitmask; 37 + __u8 invflags; 38 + __u16 sport[2]; 39 + __u16 dport[2]; 40 40 }; 41 41 42 42 #endif
+8 -8
include/linux/netfilter_bridge/ebt_ip6.h
··· 31 31 struct in6_addr daddr; 32 32 struct in6_addr smsk; 33 33 struct in6_addr dmsk; 34 - uint8_t tclass; 35 - uint8_t protocol; 36 - uint8_t bitmask; 37 - uint8_t invflags; 34 + __u8 tclass; 35 + __u8 protocol; 36 + __u8 bitmask; 37 + __u8 invflags; 38 38 union { 39 - uint16_t sport[2]; 40 - uint8_t icmpv6_type[2]; 39 + __u16 sport[2]; 40 + __u8 icmpv6_type[2]; 41 41 }; 42 42 union { 43 - uint16_t dport[2]; 44 - uint8_t icmpv6_code[2]; 43 + __u16 dport[2]; 44 + __u8 icmpv6_code[2]; 45 45 }; 46 46 }; 47 47
+4 -4
include/linux/netfilter_bridge/ebt_limit.h
··· 10 10 seconds, or one every 59 hours. */ 11 11 12 12 struct ebt_limit_info { 13 - u_int32_t avg; /* Average secs between packets * scale */ 14 - u_int32_t burst; /* Period multiplier for upper limit. */ 13 + __u32 avg; /* Average secs between packets * scale */ 14 + __u32 burst; /* Period multiplier for upper limit. */ 15 15 16 16 /* Used internally by the kernel */ 17 17 unsigned long prev; 18 - u_int32_t credit; 19 - u_int32_t credit_cap, cost; 18 + __u32 credit; 19 + __u32 credit_cap, cost; 20 20 }; 21 21 22 22 #endif
+3 -3
include/linux/netfilter_bridge/ebt_log.h
··· 10 10 #define EBT_LOG_WATCHER "log" 11 11 12 12 struct ebt_log_info { 13 - uint8_t loglevel; 14 - uint8_t prefix[EBT_LOG_PREFIX_SIZE]; 15 - uint32_t bitmask; 13 + __u8 loglevel; 14 + __u8 prefix[EBT_LOG_PREFIX_SIZE]; 15 + __u32 bitmask; 16 16 }; 17 17 18 18 #endif
+2 -2
include/linux/netfilter_bridge/ebt_mark_m.h
··· 6 6 #define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR) 7 7 struct ebt_mark_m_info { 8 8 unsigned long mark, mask; 9 - uint8_t invert; 10 - uint8_t bitmask; 9 + __u8 invert; 10 + __u8 bitmask; 11 11 }; 12 12 #define EBT_MARK_MATCH "mark_m" 13 13
+5 -5
include/linux/netfilter_bridge/ebt_nflog.h
··· 10 10 #define EBT_NFLOG_DEFAULT_THRESHOLD 1 11 11 12 12 struct ebt_nflog_info { 13 - u_int32_t len; 14 - u_int16_t group; 15 - u_int16_t threshold; 16 - u_int16_t flags; 17 - u_int16_t pad; 13 + __u32 len; 14 + __u16 group; 15 + __u16 threshold; 16 + __u16 flags; 17 + __u16 pad; 18 18 char prefix[EBT_NFLOG_PREFIX_SIZE]; 19 19 }; 20 20
+2 -2
include/linux/netfilter_bridge/ebt_pkttype.h
··· 2 2 #define __LINUX_BRIDGE_EBT_PKTTYPE_H 3 3 4 4 struct ebt_pkttype_info { 5 - uint8_t pkt_type; 6 - uint8_t invert; 5 + __u8 pkt_type; 6 + __u8 invert; 7 7 }; 8 8 #define EBT_PKTTYPE_MATCH "pkttype" 9 9
+12 -12
include/linux/netfilter_bridge/ebt_stp.h
··· 21 21 #define EBT_STP_MATCH "stp" 22 22 23 23 struct ebt_stp_config_info { 24 - uint8_t flags; 25 - uint16_t root_priol, root_priou; 24 + __u8 flags; 25 + __u16 root_priol, root_priou; 26 26 char root_addr[6], root_addrmsk[6]; 27 - uint32_t root_costl, root_costu; 28 - uint16_t sender_priol, sender_priou; 27 + __u32 root_costl, root_costu; 28 + __u16 sender_priol, sender_priou; 29 29 char sender_addr[6], sender_addrmsk[6]; 30 - uint16_t portl, portu; 31 - uint16_t msg_agel, msg_ageu; 32 - uint16_t max_agel, max_ageu; 33 - uint16_t hello_timel, hello_timeu; 34 - uint16_t forward_delayl, forward_delayu; 30 + __u16 portl, portu; 31 + __u16 msg_agel, msg_ageu; 32 + __u16 max_agel, max_ageu; 33 + __u16 hello_timel, hello_timeu; 34 + __u16 forward_delayl, forward_delayu; 35 35 }; 36 36 37 37 struct ebt_stp_info { 38 - uint8_t type; 38 + __u8 type; 39 39 struct ebt_stp_config_info config; 40 - uint16_t bitmask; 41 - uint16_t invflags; 40 + __u16 bitmask; 41 + __u16 invflags; 42 42 }; 43 43 44 44 #endif
+1 -1
include/linux/netfilter_bridge/ebt_ulog.h
··· 10 10 #define EBT_ULOG_VERSION 1 11 11 12 12 struct ebt_ulog_info { 13 - uint32_t nlgroup; 13 + __u32 nlgroup; 14 14 unsigned int cprange; 15 15 unsigned int qthreshold; 16 16 char prefix[EBT_ULOG_PREFIX_LEN];
+4 -4
include/linux/netfilter_bridge/ebt_vlan.h
··· 8 8 #define EBT_VLAN_MATCH "vlan" 9 9 10 10 struct ebt_vlan_info { 11 - uint16_t id; /* VLAN ID {1-4095} */ 12 - uint8_t prio; /* VLAN User Priority {0-7} */ 11 + __u16 id; /* VLAN ID {1-4095} */ 12 + __u8 prio; /* VLAN User Priority {0-7} */ 13 13 __be16 encap; /* VLAN Encapsulated frame code {0-65535} */ 14 - uint8_t bitmask; /* Args bitmask bit 1=1 - ID arg, 14 + __u8 bitmask; /* Args bitmask bit 1=1 - ID arg, 15 15 bit 2=1 User-Priority arg, bit 3=1 encap*/ 16 - uint8_t invflags; /* Inverse bitmask bit 1=1 - inversed ID arg, 16 + __u8 invflags; /* Inverse bitmask bit 1=1 - inversed ID arg, 17 17 bit 2=1 - inversed Pirority arg */ 18 18 }; 19 19
+7 -7
include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
··· 17 17 18 18 struct ipt_clusterip_tgt_info { 19 19 20 - u_int32_t flags; 20 + __u32 flags; 21 21 22 22 /* only relevant for new ones */ 23 - u_int8_t clustermac[6]; 24 - u_int16_t num_total_nodes; 25 - u_int16_t num_local_nodes; 26 - u_int16_t local_nodes[CLUSTERIP_MAX_NODES]; 27 - u_int32_t hash_mode; 28 - u_int32_t hash_initval; 23 + __u8 clustermac[6]; 24 + __u16 num_total_nodes; 25 + __u16 num_local_nodes; 26 + __u16 local_nodes[CLUSTERIP_MAX_NODES]; 27 + __u32 hash_mode; 28 + __u32 hash_initval; 29 29 30 30 /* Used internally by the kernel */ 31 31 struct clusterip_config *config;
+3 -3
include/linux/netfilter_ipv4/ipt_ECN.h
··· 19 19 #define IPT_ECN_OP_MASK 0xce 20 20 21 21 struct ipt_ECN_info { 22 - u_int8_t operation; /* bitset of operations */ 23 - u_int8_t ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */ 22 + __u8 operation; /* bitset of operations */ 23 + __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */ 24 24 union { 25 25 struct { 26 - u_int8_t ece:1, cwr:1; /* TCP ECT bits */ 26 + __u8 ece:1, cwr:1; /* TCP ECT bits */ 27 27 } tcp; 28 28 } proto; 29 29 };
+3 -3
include/linux/netfilter_ipv4/ipt_SAME.h
··· 7 7 8 8 struct ipt_same_info { 9 9 unsigned char info; 10 - u_int32_t rangesize; 11 - u_int32_t ipnum; 12 - u_int32_t *iparray; 10 + __u32 rangesize; 11 + __u32 ipnum; 12 + __u32 *iparray; 13 13 14 14 /* hangs off end. */ 15 15 struct nf_nat_range range[IPT_SAME_MAX_RANGE];
+2 -2
include/linux/netfilter_ipv4/ipt_TTL.h
··· 13 13 #define IPT_TTL_MAXMODE IPT_TTL_DEC 14 14 15 15 struct ipt_TTL_info { 16 - u_int8_t mode; 17 - u_int8_t ttl; 16 + __u8 mode; 17 + __u8 ttl; 18 18 }; 19 19 20 20
+7 -7
include/linux/netfilter_ipv4/ipt_addrtype.h
··· 9 9 }; 10 10 11 11 struct ipt_addrtype_info_v1 { 12 - u_int16_t source; /* source-type mask */ 13 - u_int16_t dest; /* dest-type mask */ 14 - u_int32_t flags; 12 + __u16 source; /* source-type mask */ 13 + __u16 dest; /* dest-type mask */ 14 + __u32 flags; 15 15 }; 16 16 17 17 /* revision 0 */ 18 18 struct ipt_addrtype_info { 19 - u_int16_t source; /* source-type mask */ 20 - u_int16_t dest; /* dest-type mask */ 21 - u_int32_t invert_source; 22 - u_int32_t invert_dest; 19 + __u16 source; /* source-type mask */ 20 + __u16 dest; /* dest-type mask */ 21 + __u32 invert_source; 22 + __u32 invert_dest; 23 23 }; 24 24 25 25 #endif
+2 -2
include/linux/netfilter_ipv4/ipt_ah.h
··· 2 2 #define _IPT_AH_H 3 3 4 4 struct ipt_ah { 5 - u_int32_t spis[2]; /* Security Parameter Index */ 6 - u_int8_t invflags; /* Inverse flags */ 5 + __u32 spis[2]; /* Security Parameter Index */ 6 + __u8 invflags; /* Inverse flags */ 7 7 }; 8 8 9 9
+4 -4
include/linux/netfilter_ipv4/ipt_ecn.h
··· 20 20 21 21 /* match info */ 22 22 struct ipt_ecn_info { 23 - u_int8_t operation; 24 - u_int8_t invert; 25 - u_int8_t ip_ect; 23 + __u8 operation; 24 + __u8 invert; 25 + __u8 ip_ect; 26 26 union { 27 27 struct { 28 - u_int8_t ect; 28 + __u8 ect; 29 29 } tcp; 30 30 } proto; 31 31 };
+2 -2
include/linux/netfilter_ipv4/ipt_ttl.h
··· 13 13 14 14 15 15 struct ipt_ttl_info { 16 - u_int8_t mode; 17 - u_int8_t ttl; 16 + __u8 mode; 17 + __u8 ttl; 18 18 }; 19 19 20 20
+2 -2
include/linux/netfilter_ipv6/ip6t_HL.h
··· 14 14 #define IP6T_HL_MAXMODE IP6T_HL_DEC 15 15 16 16 struct ip6t_HL_info { 17 - u_int8_t mode; 18 - u_int8_t hop_limit; 17 + __u8 mode; 18 + __u8 hop_limit; 19 19 }; 20 20 21 21
+1 -1
include/linux/netfilter_ipv6/ip6t_REJECT.h
··· 12 12 }; 13 13 14 14 struct ip6t_reject_info { 15 - u_int32_t with; /* reject type */ 15 + __u32 with; /* reject type */ 16 16 }; 17 17 18 18 #endif /*_IP6T_REJECT_H*/
+4 -4
include/linux/netfilter_ipv6/ip6t_ah.h
··· 2 2 #define _IP6T_AH_H 3 3 4 4 struct ip6t_ah { 5 - u_int32_t spis[2]; /* Security Parameter Index */ 6 - u_int32_t hdrlen; /* Header Length */ 7 - u_int8_t hdrres; /* Test of the Reserved Filed */ 8 - u_int8_t invflags; /* Inverse flags */ 5 + __u32 spis[2]; /* Security Parameter Index */ 6 + __u32 hdrlen; /* Header Length */ 7 + __u8 hdrres; /* Test of the Reserved Filed */ 8 + __u8 invflags; /* Inverse flags */ 9 9 }; 10 10 11 11 #define IP6T_AH_SPI 0x01
+4 -4
include/linux/netfilter_ipv6/ip6t_frag.h
··· 2 2 #define _IP6T_FRAG_H 3 3 4 4 struct ip6t_frag { 5 - u_int32_t ids[2]; /* Security Parameter Index */ 6 - u_int32_t hdrlen; /* Header Length */ 7 - u_int8_t flags; /* */ 8 - u_int8_t invflags; /* Inverse flags */ 5 + __u32 ids[2]; /* Security Parameter Index */ 6 + __u32 hdrlen; /* Header Length */ 7 + __u8 flags; /* */ 8 + __u8 invflags; /* Inverse flags */ 9 9 }; 10 10 11 11 #define IP6T_FRAG_IDS 0x01
+2 -2
include/linux/netfilter_ipv6/ip6t_hl.h
··· 14 14 15 15 16 16 struct ip6t_hl_info { 17 - u_int8_t mode; 18 - u_int8_t hop_limit; 17 + __u8 mode; 18 + __u8 hop_limit; 19 19 }; 20 20 21 21
+3 -3
include/linux/netfilter_ipv6/ip6t_ipv6header.h
··· 9 9 #define __IPV6HEADER_H 10 10 11 11 struct ip6t_ipv6header_info { 12 - u_int8_t matchflags; 13 - u_int8_t invflags; 14 - u_int8_t modeflag; 12 + __u8 matchflags; 13 + __u8 invflags; 14 + __u8 modeflag; 15 15 }; 16 16 17 17 #define MASK_HOPOPTS 128
+2 -2
include/linux/netfilter_ipv6/ip6t_mh.h
··· 3 3 4 4 /* MH matching stuff */ 5 5 struct ip6t_mh { 6 - u_int8_t types[2]; /* MH type range */ 7 - u_int8_t invflags; /* Inverse flags */ 6 + __u8 types[2]; /* MH type range */ 7 + __u8 invflags; /* Inverse flags */ 8 8 }; 9 9 10 10 /* Values for "invflags" field in struct ip6t_mh. */
+5 -5
include/linux/netfilter_ipv6/ip6t_opts.h
··· 4 4 #define IP6T_OPTS_OPTSNR 16 5 5 6 6 struct ip6t_opts { 7 - u_int32_t hdrlen; /* Header Length */ 8 - u_int8_t flags; /* */ 9 - u_int8_t invflags; /* Inverse flags */ 10 - u_int16_t opts[IP6T_OPTS_OPTSNR]; /* opts */ 11 - u_int8_t optsnr; /* Nr of OPts */ 7 + __u32 hdrlen; /* Header Length */ 8 + __u8 flags; /* */ 9 + __u8 invflags; /* Inverse flags */ 10 + __u16 opts[IP6T_OPTS_OPTSNR]; /* opts */ 11 + __u8 optsnr; /* Nr of OPts */ 12 12 }; 13 13 14 14 #define IP6T_OPTS_LEN 0x01
+6 -6
include/linux/netfilter_ipv6/ip6t_rt.h
··· 6 6 #define IP6T_RT_HOPS 16 7 7 8 8 struct ip6t_rt { 9 - u_int32_t rt_type; /* Routing Type */ 10 - u_int32_t segsleft[2]; /* Segments Left */ 11 - u_int32_t hdrlen; /* Header Length */ 12 - u_int8_t flags; /* */ 13 - u_int8_t invflags; /* Inverse flags */ 9 + __u32 rt_type; /* Routing Type */ 10 + __u32 segsleft[2]; /* Segments Left */ 11 + __u32 hdrlen; /* Header Length */ 12 + __u8 flags; /* */ 13 + __u8 invflags; /* Inverse flags */ 14 14 struct in6_addr addrs[IP6T_RT_HOPS]; /* Hops */ 15 - u_int8_t addrnr; /* Nr of Addresses */ 15 + __u8 addrnr; /* Nr of Addresses */ 16 16 }; 17 17 18 18 #define IP6T_RT_TYP 0x01
+2
kernel/audit.c
··· 74 74 int audit_enabled; 75 75 int audit_ever_enabled; 76 76 77 + EXPORT_SYMBOL_GPL(audit_enabled); 78 + 77 79 /* Default state when kernel boots without any parameters. */ 78 80 static int audit_default; 79 81
+2
net/netfilter/xt_IDLETIMER.c
··· 313 313 MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>"); 314 314 MODULE_DESCRIPTION("Xtables: idle time monitor"); 315 315 MODULE_LICENSE("GPL v2"); 316 + MODULE_ALIAS("ipt_IDLETIMER"); 317 + MODULE_ALIAS("ip6t_IDLETIMER");
+2
net/netfilter/xt_LED.c
··· 31 31 MODULE_LICENSE("GPL"); 32 32 MODULE_AUTHOR("Adam Nielsen <a.nielsen@shikadi.net>"); 33 33 MODULE_DESCRIPTION("Xtables: trigger LED devices on packet match"); 34 + MODULE_ALIAS("ipt_LED"); 35 + MODULE_ALIAS("ip6t_LED"); 34 36 35 37 static LIST_HEAD(xt_led_triggers); 36 38 static DEFINE_MUTEX(xt_led_mutex);
+2 -4
net/netfilter/xt_connlimit.c
··· 204 204 &info->mask, par->family); 205 205 spin_unlock_bh(&info->data->lock); 206 206 207 - if (connections < 0) { 207 + if (connections < 0) 208 208 /* kmalloc failed, drop it entirely */ 209 - par->hotdrop = true; 210 - return false; 211 - } 209 + goto hotdrop; 212 210 213 211 return (connections > info->limit) ^ info->inverse; 214 212
+2
net/netfilter/xt_cpu.c
··· 22 22 MODULE_LICENSE("GPL"); 23 23 MODULE_AUTHOR("Eric Dumazet <eric.dumazet@gmail.com>"); 24 24 MODULE_DESCRIPTION("Xtables: CPU match"); 25 + MODULE_ALIAS("ipt_cpu"); 26 + MODULE_ALIAS("ip6t_cpu"); 25 27 26 28 static int cpu_mt_check(const struct xt_mtchk_param *par) 27 29 {