aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-06-068-74/+116
|\
| * netfilter: nfnetlink_queue: only add CAP_LEN attr when neededFlorian Westphal2013-06-051-1/+2
| * netfilter: nfnetlink_queue: cleanup copy_range usageFlorian Westphal2013-06-051-10/+12
| * netfilter: Implement RFC 1123 for FTP conntrackJeff Mahoney2013-05-271-19/+54
| * netfilter: nfnetlink_queue: avoid peer_portid testFlorian Westphal2013-05-261-4/+0
| * ipvs: change type of netns_ipvs->sysctl_sync_qlen_maxZhang Yanfei2013-05-261-2/+2
| * ipvs: use cond_resched_rcu() helper when walking connectionsSimon Horman2013-05-231-15/+8
| * netfilter: don't panic on error while walking through the init pathPablo Neira Ayuso2013-05-232-10/+16
| * netfilter: xt_socket: use IP early demuxEric Dumazet2013-05-231-10/+16
| * netfilter: xt_CT: optimize XT_CT_NOTRACKEric Dumazet2013-05-231-4/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-055-13/+55
|\ \
| * | ipvs: ip_vs_sh: fix buildJan Beulich2013-05-291-1/+1
| * | netfilter: xt_LOG: fix mark logging for IPv6 packetsMichal Kubeček2013-05-291-1/+1
| * | ipvs: Fix reuse connection if real server is deadGrzegorz Lyczba2013-05-271-0/+35
| * | netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6Florian Westphal2013-05-232-11/+18
* | | netfilter: Correct calculation using skb->tail and skb-network_headerSimon Horman2013-05-311-1/+1
* | | net: pass info struct via netdevice notifierJiri Pirko2013-05-283-4/+4
|/ /
* | netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundaryPablo Neira Ayuso2013-05-161-3/+14
* | netfilter: log: netns NULL ptr bug when calling from conntrackHans Schillstrom2013-05-154-10/+12
* | netfilter: nf_{log,queue}: fix compilation without CONFIG_PROC_FSPablo Neira Ayuso2013-05-063-1/+8
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-05-013-13/+18
|\
| * proc: Supply PDE attribute setting accessor functionsDavid Howells2013-05-011-2/+1
| * xt_hashlimit: allocate a copy of name explicitly, don't rely on procfs gutsAl Viro2013-04-291-3/+11
| * procfs: new helper - PDE_DATA(inode)Al Viro2013-04-093-8/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-05-0176-5286/+5835
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-301-5/+1
| |\ \
| | * | ipvs: ip_vs_sip_fill_param() BUG: bad check of return valueHans Schillstrom2013-04-291-5/+1
| * | | sctp: Correct type and usage of sctp_end_cksum()Simon Horman2013-04-291-3/+2
| * | | netfilter: nfnetlink_queue: avoid expensive gso segmentation and checksum fixupFlorian Westphal2013-04-291-2/+3
| * | | netfilter: nfnetlink_queue: add skb info attributeFlorian Westphal2013-04-291-0/+16
| * | | netfilter: move skb_gso_segment into nfnetlink_queue moduleFlorian Westphal2013-04-292-104/+146
| * | | netfilter: nf_queue: move device refcount bump to extra functionFlorian Westphal2013-04-291-21/+28
| * | | netfilter: ipset: set match: add support to match the countersJozsef Kadlecsik2013-04-293-3/+77
| * | | netfilter: ipset: The list:set type with counter supportJozsef Kadlecsik2013-04-291-6/+67
| * | | netfilter: ipset: The hash types with counter supportJozsef Kadlecsik2013-04-298-19/+381
| * | | netfilter: ipset: The bitmap types with counter supportJozsef Kadlecsik2013-04-294-15/+186
| * | | netfilter: ipset: Introduce the counter extension in the coreJozsef Kadlecsik2013-04-291-0/+10
| * | | netfilter: ipset: list:set type using the extension interfaceJozsef Kadlecsik2013-04-291-246/+301
| * | | netfilter: ipset: Hash types using the unified code baseJozsef Kadlecsik2013-04-297-1865/+610
| * | | netfilter: ipset: Unified hash type generationJozsef Kadlecsik2013-04-291-0/+1039
| * | | netfilter: ipset: Bitmap types using the unified code baseJozsef Kadlecsik2013-04-293-958/+316
| * | | netfilter: ipset: Unified bitmap type generationJozsef Kadlecsik2013-04-291-0/+265
| * | | netfilter: ipset: Introduce extensions to elements in the coreJozsef Kadlecsik2013-04-292-23/+25
| * | | netfilter: ipset: Move often used IPv6 address masking function to header fileJozsef Kadlecsik2013-04-295-45/+0
| * | | netfilter: ipset: Make possible to test elements marked with nomatchJozsef Kadlecsik2013-04-294-24/+32
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-259-49/+58
| |\ \ \
| | * | | netfilter: nf_nat: missing condition in nf_xfrm_me_harder()Dan Carpenter2013-04-251-0/+1
| | * | | ipvs: Use network byte order for sync message sizeSimon Horman2013-04-231-13/+8
| | * | | ipvs: off by one in set_sctp_state()Dan Carpenter2013-04-231-1/+1
| | * | | ipvs: Use min3() in ip_vs_dbg_callid()Simon Horman2013-04-231-1/+2