Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/net/netfilter
History
David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-07-03 14:55:13 -07:00
..
ipset
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
ipvs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
core.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-06-06 01:03:06 -07:00
Kconfig
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
Makefile
netfilter: x_tables: add xt_bpf match
2013-01-21 12:20:19 +01:00
nf_conntrack_acct.c
netfilter: nf_ct_acct: move initialization out of pernet_operations
2013-01-23 12:55:29 +01:00
nf_conntrack_amanda.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_broadcast.c
netfilter: nf_conntrack: nf_conntrack snmp helper
2011-01-18 18:12:24 +01:00
nf_conntrack_core.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
nf_conntrack_ecache.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_expect.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-04-19 17:55:29 -04:00
nf_conntrack_extend.c
netfilter: nf_ct_ext: support variable length extensions
2012-06-16 15:08:49 +02:00
nf_conntrack_ftp.c
netfilter: Implement RFC 1123 for FTP conntrack
2013-05-27 13:32:43 +02:00
nf_conntrack_h323_asn1.c
netfilter: h323: bug in parsing of ASN1 SEQOF field
2011-04-04 15:21:02 +02:00
nf_conntrack_h323_main.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_h323_types.c
[NETFILTER]: nf_conntrack_h323: constify and annotate H.323 helper
2008-01-31 19:28:07 -08:00
nf_conntrack_helper.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_irc.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_l3proto_generic.c
[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l3proto
2008-04-14 11:15:52 +02:00
nf_conntrack_labels.c
netfilter: ctnetlink: send event when conntrack label was modified
2013-06-24 11:32:56 +02:00
nf_conntrack_netbios_ns.c
netfilter: nf_conntrack: nf_conntrack snmp helper
2011-01-18 18:12:24 +01:00
nf_conntrack_netlink.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
nf_conntrack_pptp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_dccp.c
netfilter: nf_log: prepare net namespace support for loggers
2013-04-05 20:12:54 +02:00
nf_conntrack_proto_generic.c
netfilter: nf_conntrack: generalize nf_ct_l4proto_net
2012-07-04 19:37:22 +02:00
nf_conntrack_proto_gre.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_sctp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_tcp.c
netfilter: nf_conntrack: avoid large timeout for mid-stream pickup
2013-06-20 11:20:13 +02:00
nf_conntrack_proto_udp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_proto_udplite.c
netfilter: nf_log: prepare net namespace support for loggers
2013-04-05 20:12:54 +02:00
nf_conntrack_proto.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_sane.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_conntrack_sip.c
netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet
2013-04-06 14:03:18 +02:00
nf_conntrack_snmp.c
netfilter: nf_ct_snmp: add include file
2013-01-18 00:28:18 +01:00
nf_conntrack_standalone.c
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nf_conntrack_tftp.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_conntrack_timeout.c
netfilter: nf_ct_timeout: move initialization out of pernet_operations
2013-01-23 12:56:02 +01:00
nf_conntrack_timestamp.c
netfilter: nf_ct_tstamp: move initialization out of pernet_operations
2013-01-23 12:55:39 +01:00
nf_internals.h
netfilter: pass 'nf_hook_ops' instead of 'list_head' to nf_queue()
2012-09-03 13:52:54 +02:00
nf_log.c
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nf_nat_amanda.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
nf_nat_core.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-04-25 00:53:40 -04:00
nf_nat_ftp.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_nat_helper.c
netfilter: Correct calculation using skb->tail and skb-network_header
2013-05-31 16:38:25 -07:00
nf_nat_irc.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_nat_proto_common.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_dccp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_sctp.c
sctp: Correct type and usage of sctp_end_cksum()
2013-04-29 20:09:08 +02:00
nf_nat_proto_tcp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_udp.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_udplite.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_proto_unknown.c
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
nf_nat_sip.c
netfilter: nf_nat_sip: fix mangling
2013-06-24 11:32:40 +02:00
nf_nat_tftp.c
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
nf_queue.c
netfilter: move skb_gso_segment into nfnetlink_queue module
2013-04-29 20:09:05 +02:00
nf_sockopt.c
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
nf_tproxy_core.c
netfilter: tproxy: do not assign timewait sockets to skb->sk
2011-02-17 11:32:38 +01:00
nfnetlink_acct.c
netfilter: nfnetlink_acct: fix incomplete dumping of objects
2013-06-05 12:36:36 +02:00
nfnetlink_cthelper.c
netfilter: check return code from nla_parse_tested
2013-06-20 11:20:13 +02:00
nfnetlink_cttimeout.c
netfilter: check return code from nla_parse_tested
2013-06-20 11:20:13 +02:00
nfnetlink_log.c
netfilter: log: netns NULL ptr bug when calling from conntrack
2013-05-15 14:11:07 +02:00
nfnetlink_queue_core.c
netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag
2013-06-30 18:15:48 +02:00
nfnetlink_queue_ct.c
netfilter: nfnetlink_queue: fix sparse warning due to missing include
2012-06-23 02:13:38 +02:00
nfnetlink.c
nfnetlink: add support for memory mapped netlink
2013-04-19 14:58:36 -04:00
x_tables.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
xt_addrtype.c
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
xt_AUDIT.c
netfilter: xt_AUDIT: only generate audit log when audit enabled
2013-03-04 14:45:25 +01:00
xt_bpf.c
netfilter: x_tables: add xt_bpf match
2013-01-21 12:20:19 +01:00
xt_CHECKSUM.c
netfilter: add CHECKSUM target
2010-07-15 17:20:46 +02:00
xt_CLASSIFY.c
netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any table
2010-11-15 13:57:56 +01:00
xt_cluster.c
netfilter: nf_conntrack: IPS_UNTRACKED bit
2010-06-08 16:09:52 +02:00
xt_comment.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_connbytes.c
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
2011-12-25 02:21:45 -05:00
xt_connlabel.c
netfilter: add connlabel conntrack extension
2013-01-18 00:28:15 +01:00
xt_connlimit.c
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
xt_connmark.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_CONNSECMARK.c
netfilter: xtables: substitute temporary defines by final name
2010-05-11 18:31:17 +02:00
xt_conntrack.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
xt_cpu.c
netfilter: xtables: add missing aliases for autoloading via iptables
2011-01-18 06:33:54 +01:00
xt_CT.c
netfilter: xt_CT: optimize XT_CT_NOTRACK
2013-05-23 11:09:29 +02:00
xt_dccp.c
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
xt_devgroup.c
netfilter: xtables: add device group match
2011-02-03 00:05:43 +01:00
xt_dscp.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_DSCP.c
netfilter: IPv6: fix DSCP mangle code
2011-05-10 10:00:21 +02:00
xt_ecn.c
netfilter: xtables: collapse conditions in xt_ecn
2011-12-27 20:45:25 +01:00
xt_esp.c
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
xt_hashlimit.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
xt_helper.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_hl.c
netfilter: Reduce switch/case indent
2011-07-01 16:11:15 -07:00
xt_HL.c
netfilter: Reduce switch/case indent
2011-07-01 16:11:15 -07:00
xt_HMARK.c
ipv6: Move ipv6_find_hdr() out of Netfilter code.
2012-11-09 17:05:07 -08:00
xt_IDLETIMER.c
netfilter: Remove unnecessary OOM logging messages
2011-11-01 09:19:49 +01:00
xt_iprange.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-02-04 14:28:58 -08:00
xt_ipvs.c
ipvs: API change to avoid rescan of IPv6 exthdr
2012-09-28 11:34:33 +09:00
xt_LED.c
netfilter: xtables: add missing aliases for autoloading via iptables
2011-01-18 06:33:54 +01:00
xt_length.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_limit.c
netfilter: add my copyright statements
2013-04-18 20:27:55 +02:00
xt_LOG.c
netfilter: xt_LOG: fix mark logging for IPv6 packets
2013-05-29 12:29:18 +02:00
xt_mac.c
netfilter: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:18 -04:00
xt_mark.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_multiport.c
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
xt_nat.c
netfilter: xt_nat: fix incorrect hooks for SNAT and DNAT targets
2012-10-15 13:39:12 +02:00
xt_NETMAP.c
netfilter: combine ipt_NETMAP and ip6t_NETMAP
2012-09-21 12:11:08 +02:00
xt_nfacct.c
netfilter: xtables: add nfacct match to support extended accounting
2011-12-25 02:43:17 +01:00
xt_NFLOG.c
netfilter: log: netns NULL ptr bug when calling from conntrack
2013-05-15 14:11:07 +02:00
xt_NFQUEUE.c
netfilter: xt_NFQUEUE: coalesce IPv4 and IPv6 hashing
2013-04-02 01:26:10 +02:00
xt_osf.c
netfilter: nf_log: prepare net namespace support for loggers
2013-04-05 20:12:54 +02:00
xt_owner.c
userns: xt_owner: Add basic user namespace support.
2012-08-14 21:55:30 -07:00
xt_physdev.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_pkttype.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_policy.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_quota.c
net: Fix files explicitly needing to include module.h
2011-10-31 19:30:28 -04:00
xt_rateest.c
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
xt_RATEEST.c
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
xt_realm.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_recent.c
proc: Supply PDE attribute setting accessor functions
2013-05-01 17:29:18 -04:00
xt_REDIRECT.c
netfilter: combine ipt_REDIRECT and ip6t_REDIRECT
2012-09-21 12:12:05 +02:00
xt_repldata.h
netfilter: xtables: generate initial table on-demand
2010-02-10 17:50:47 +01:00
xt_sctp.c
netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4 bytes
2010-06-09 14:47:40 +02:00
xt_SECMARK.c
secmark: make secmark object handling generic
2010-10-21 10:12:48 +11:00
xt_set.c
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
xt_socket.c
netfilter: xt_socket: add XT_SOCKET_NOWILDCARD flag
2013-06-20 20:28:49 +02:00
xt_state.c
netfilter: nf_conntrack: IPS_UNTRACKED bit
2010-06-08 16:09:52 +02:00
xt_statistic.c
net: Fix files explicitly needing to include module.h
2011-10-31 19:30:28 -04:00
xt_string.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00
xt_tcpmss.c
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
xt_TCPMSS.c
netfilter: xt_TCPMSS: Fix missing fragmentation handling
2013-06-12 11:06:19 +02:00
xt_TCPOPTSTRIP.c
netfilter: xt_TCPOPTSTRIP: don't use tcp_hdr()
2013-06-11 01:55:07 +02:00
xt_tcpudp.c
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
xt_TEE.c
net: pass info struct via netdevice notifier
2013-05-28 13:11:01 -07:00
xt_time.c
netfilter: xt_time: add support to ignore day transition
2012-09-24 14:29:01 +02:00
xt_TPROXY.c
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
xt_TRACE.c
netfilter: xtables: substitute temporary defines by final name
2010-05-11 18:31:17 +02:00
xt_u32.c
netfilter: xtables: deconstify struct xt_action_param for matches
2010-05-11 18:33:37 +02:00