FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 21:02:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/netfilter
History
David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-02-05 14:33:28 -08:00
..
ipset
netfilter: ipset: Explicitly add padding elements to hash:net, net and hash:net, port, net
2014-12-03 12:43:36 +01:00
ipvs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
core.c
netfilter: fix various sparse warnings
2014-11-13 12:14:42 +01:00
Kconfig
netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module
2014-11-27 13:08:42 +01:00
Makefile
netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module
2014-11-27 13:08:42 +01:00
nf_conntrack_acct.c
netfilter: introduce nf_conn_acct structure
2013-11-03 21:48:49 +01:00
nf_conntrack_amanda.c
…
nf_conntrack_broadcast.c
…
nf_conntrack_core.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-01-15 01:50:25 -05:00
nf_conntrack_ecache.c
netfilter: conntrack: remove timer from ecache extension
2014-06-25 19:15:38 +02:00
nf_conntrack_expect.c
net: use reciprocal_scale() helper
2014-08-23 12:21:21 -07:00
nf_conntrack_extend.c
…
nf_conntrack_ftp.c
netfilter: replace strnicmp with strncasecmp
2014-10-14 02:18:24 +02:00
nf_conntrack_h323_asn1.c
…
nf_conntrack_h323_main.c
netfilter: nf_conntrack_h323: lookup route from proper net namespace
2014-11-17 12:47:14 +01:00
nf_conntrack_h323_types.c
…
nf_conntrack_helper.c
netfilter: fix spelling errors
2014-10-30 17:35:30 +01:00
nf_conntrack_irc.c
…
nf_conntrack_l3proto_generic.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_labels.c
…
nf_conntrack_netbios_ns.c
…
nf_conntrack_netlink.c
netfilter: conntrack: Flush connections with a given mark
2015-01-08 12:14:20 +01:00
nf_conntrack_pptp.c
netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper
2014-04-08 10:56:12 +02:00
nf_conntrack_proto_dccp.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto_generic.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto_gre.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto_sctp.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto_tcp.c
Merge branch 'iov_iter' into for-next
2014-12-08 20:39:29 -05:00
nf_conntrack_proto_udp.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto_udplite.c
netfilter: Convert print_tuple functions to return void
2014-11-05 14:10:33 -05:00
nf_conntrack_proto.c
netfilter: nf_conntrack: remove dead code
2014-01-03 23:41:37 +01:00
nf_conntrack_sane.c
…
nf_conntrack_seqadj.c
netfilter: nf_ct_seqadj: print ack seq in the right host byte order
2015-01-05 13:52:20 +01:00
nf_conntrack_sip.c
netfilter: replace strnicmp with strncasecmp
2014-10-14 02:18:24 +02:00
nf_conntrack_snmp.c
…
nf_conntrack_standalone.c
netfilter: Remove checks of seq_printf() return values
2014-11-05 14:11:02 -05:00
nf_conntrack_tftp.c
…
nf_conntrack_timeout.c
…
nf_conntrack_timestamp.c
netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletion
2013-12-20 14:58:29 +01:00
nf_internals.h
net: misc: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
nf_log_common.c
netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
2014-10-02 18:30:54 +02:00
nf_log.c
netfilter: log: remove unnecessary sizeof(char)
2014-12-23 14:33:58 +01:00
nf_nat_amanda.c
…
nf_nat_core.c
net: use reciprocal_scale() helper
2014-08-23 12:21:21 -07:00
nf_nat_ftp.c
…
nf_nat_helper.c
…
nf_nat_irc.c
netfilter: nf_nat: fix access to uninitialized buffer in IRC NAT helper
2014-01-06 14:17:17 +01:00
nf_nat_proto_common.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_dccp.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_sctp.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_tcp.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_udp.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_udplite.c
netfilter: use IS_ENABLED() macro
2014-06-30 11:38:03 +02:00
nf_nat_proto_unknown.c
…
nf_nat_redirect.c
netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module
2014-11-27 13:08:42 +01:00
nf_nat_sip.c
netfilter: replace strnicmp with strncasecmp
2014-10-14 02:18:24 +02:00
nf_nat_tftp.c
…
nf_queue.c
netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
2014-10-02 18:30:54 +02:00
nf_sockopt.c
netfilter: don't use mutex_lock_interruptible()
2014-08-08 16:47:23 +02:00
nf_synproxy_core.c
netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt
2014-02-05 17:46:06 +01:00
nf_tables_api.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
nf_tables_core.c
netfilter: nf_tables: 64bit stats need some extra synchronization
2014-07-14 12:00:17 +02:00
nf_tables_inet.c
netfilter: nf_tables: fix error path in the init functions
2014-01-09 23:25:48 +01:00
nfnetlink_acct.c
netfilter: nfnetlink_acct: add filter support to nfacct counter list/reset
2014-08-26 21:36:19 +02:00
nfnetlink_cthelper.c
netfilter: nfnetlink_cthelper: Remove 'const' and '&' to avoid warnings
2015-01-05 12:42:54 +01:00
nfnetlink_cttimeout.c
netfilter: cttimeout: allow to set/get default protocol timeouts
2013-10-01 13:17:39 +02:00
nfnetlink_log.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-11-24 16:00:58 -05:00
nfnetlink_queue_core.c
Merge branch 'iov_iter' into for-next
2014-12-08 20:39:29 -05:00
nfnetlink_queue_ct.c
…
nfnetlink.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-01-15 01:50:25 -05:00
nft_bitwise.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_byteorder.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_cmp.c
netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4
2014-04-14 10:38:02 +02:00
nft_compat.c
netfilter: nft_compat: use the match->table to validate dependencies
2014-11-12 12:06:24 +01:00
nft_counter.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_ct.c
netfilter: nft_ct: split nft_ct_init() into two functions for get/set
2014-04-02 21:29:45 +02:00
nft_expr_template.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_exthdr.c
netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offset
2013-12-20 11:25:10 +01:00
nft_hash.c
netfilter: Use rhashtable walk iterator
2015-02-04 20:34:53 -08:00
nft_immediate.c
netfilter: nf_tables: restore context for expression destructors
2014-03-08 12:35:17 +01:00
nft_limit.c
netfilter: nf_tables: expression ops overloading
2013-10-14 17:16:08 +02:00
nft_log.c
netfilter: nft_log: fix coccinelle warnings
2014-06-29 13:55:08 +02:00
nft_lookup.c
netfilter: nf_tables: use new transaction infrastructure to handle sets
2014-05-19 12:06:10 +02:00
nft_masq.c
netfilter: nf_tables: validate hooks in NAT expressions
2015-01-19 14:52:39 +01:00
nft_meta.c
netfilter: nft_meta: add cgroup support
2014-11-09 16:21:22 +01:00
nft_nat.c
netfilter: nf_tables: validate hooks in NAT expressions
2015-01-19 14:52:39 +01:00
nft_payload.c
netfilter: nf_tables: check if payload length is a power of 2
2014-02-17 11:21:17 +01:00
nft_queue.c
netfilter: nf_tables: fix log/queue expressions for NFPROTO_INET
2014-02-06 11:41:38 +01:00
nft_rbtree.c
netfilter: nft_rbtree: no need for spinlock from set destroy path
2014-09-03 10:57:08 +02:00
nft_redir.c
netfilter: nf_tables: validate hooks in NAT expressions
2015-01-19 14:52:39 +01:00
nft_reject_inet.c
netfilter: nft_reject: introduce icmp code abstraction for inet and bridge
2014-10-02 18:29:57 +02:00
nft_reject.c
netfilter: fix wrong arithmetics regarding NFT_REJECT_ICMPX_MAX
2014-10-07 20:16:31 +02:00
x_tables.c
netfilter: Remove checks of seq_printf() return values
2014-11-05 14:11:02 -05:00
xt_addrtype.c
…
xt_AUDIT.c
netfilter: Convert uses of __constant_<foo> to <foo>
2014-03-13 14:13:19 +01:00
xt_bpf.c
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
xt_cgroup.c
netfilter: x_tables: allow to use default cgroup match
2014-08-19 21:38:55 +02:00
xt_CHECKSUM.c
…
xt_CLASSIFY.c
…
xt_cluster.c
net: use reciprocal_scale() helper
2014-08-23 12:21:21 -07:00
xt_comment.c
…
xt_connbytes.c
netfilter: Convert pr_warning to pr_warn
2014-09-10 12:40:10 -07:00
xt_connlabel.c
…
xt_connlimit.c
netfilter: xt_connlimit: honor conntrack zone if available
2014-11-17 12:44:20 +01:00
xt_connmark.c
netfilter: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
xt_CONNSECMARK.c
…
xt_conntrack.c
…
xt_cpu.c
…
xt_CT.c
netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt
2014-02-05 17:46:06 +01:00
xt_dccp.c
…
xt_devgroup.c
…
xt_dscp.c
…
xt_DSCP.c
netfilter: fix various sparse warnings
2014-11-13 12:14:42 +01:00
xt_ecn.c
…
xt_esp.c
…
xt_hashlimit.c
netfilter: Remove checks of seq_printf() return values
2014-11-05 14:11:02 -05:00
xt_helper.c
…
xt_hl.c
…
xt_HL.c
…
xt_HMARK.c
net: use reciprocal_scale() helper
2014-08-23 12:21:21 -07:00
xt_IDLETIMER.c
…
xt_ipcomp.c
netfilter: xt_ipcomp: Use ntohs to ease sparse warning
2014-02-19 11:41:25 +01:00
xt_iprange.c
…
xt_ipvs.c
…
xt_l2tp.c
netfilter: introduce l2tp match extension
2014-01-09 21:36:39 +01:00
xt_LED.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-05 18:46:26 -07:00
xt_length.c
…
xt_limit.c
…
xt_LOG.c
netfilter: xt_LOG: add missing string format in nf_log_packet()
2014-06-28 18:50:35 +02:00
xt_mac.c
…
xt_mark.c
…
xt_multiport.c
…
xt_nat.c
…
xt_NETMAP.c
…
xt_nfacct.c
netfilter: nfnetlink_acct: Adding quota support to accounting framework
2014-04-29 18:25:14 +02:00
xt_NFLOG.c
…
xt_NFQUEUE.c
netfilter: xt_NFQUEUE: separate reusable code
2013-12-07 23:20:45 +01:00
xt_osf.c
netfilter: xt_osf: Use continue to reduce indentation
2014-12-23 14:20:10 +01:00
xt_owner.c
…
xt_physdev.c
netfilter: explicit module dependency between br_netfilter and physdev
2014-10-02 18:30:57 +02:00
xt_pkttype.c
…
xt_policy.c
…
xt_quota.c
…
xt_rateest.c
…
xt_RATEEST.c
net: sched: make bstats per cpu and estimator RCU safe
2014-09-30 01:02:26 -04:00
xt_realm.c
…
xt_recent.c
netfilter: xt_recent: relax ip_pkt_list_tot restrictions
2014-11-27 12:40:31 +01:00
xt_REDIRECT.c
netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module
2014-11-27 13:08:42 +01:00
xt_repldata.h
net: netfilter: LLVMLinux: vlais-netfilter
2014-06-07 11:44:39 -07:00
xt_sctp.c
…
xt_SECMARK.c
…
xt_set.c
netfilter: ipset: Alignment problem between 64bit kernel 32bit userspace
2014-12-03 12:43:35 +01:00
xt_socket.c
netfilter: xt_socket: use sock_gen_put()
2013-10-17 10:27:25 +02:00
xt_state.c
…
xt_statistic.c
net: replace macros net_random and net_srandom with direct calls to prandom
2014-01-14 15:15:25 -08:00
xt_string.c
netfilter: xt_string: Remove unnecessary initialization of struct ts_state
2014-09-09 16:31:25 +02:00
xt_tcpmss.c
…
xt_TCPMSS.c
netfilter: xt_TCPMSS: lookup route from proper net namespace
2013-09-27 16:18:23 +02:00
xt_TCPOPTSTRIP.c
…
xt_tcpudp.c
…
xt_TEE.c
…
xt_time.c
…
xt_TPROXY.c
ipv6: make lookups simpler and faster
2013-10-09 00:01:25 -04:00
xt_TRACE.c
…
xt_u32.c
…