summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-231-1/+1
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-04-2627-246/+245
| |\
| * | treewide: remove extra semicolonsJustin P. Mattock2011-04-101-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-2012-76/+101
|\ \ \
| * \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-174-10/+18
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-05-171-4/+12
| | |\ \ \
| | | * | | netfilter: nf_ct_sip: fix SDP parsing in TCP SIP messages for some Cisco phonesPatrick McHardy2011-05-161-4/+10
| | | * | | netfilter: nf_ct_sip: validate Content-Length in TCP SIP messagesPatrick McHardy2011-05-161-0/+2
| | | * | | IPVS: init and cleanup restructuringHans Schillstrom2011-05-097-80/+206
| | | * | | IPVS: Change of socket usage to enable name space exit.Hans Schillstrom2011-05-092-22/+38
| | | * | | netfilter: fix ebtables compat supportEric Dumazet2011-04-211-2/+2
| | | * | | netfilter: ctnetlink: fix timestamp support for new conntracksPablo Neira Ayuso2011-04-211-0/+4
| * | | | | ipvs: Remove all remaining references to rt->rt_{src,dst}Julian Anastasov2011-05-122-46/+50
| * | | | | ipvs: Eliminate rt->rt_dst usage in __ip_vs_get_out_rt().David S. Miller2011-05-121-3/+4
| * | | | | ipvs: Use IP_VS_RT_MODE_* instead of magic constants.David S. Miller2011-05-121-9/+15
| * | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-1111-107/+248
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-04-263-10/+30
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-197-14/+22
| |\ \ \ \ \ \
| | * | | | | | netfilter: ipset: SCTP, UDPLITE support addedJozsef Kadlecsik2011-04-135-5/+19
| | * | | | | | IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocksSimon Horman2011-04-051-3/+0
| | * | | | | | netfilter: get rid of atomic ops in fast pathEric Dumazet2011-04-041-6/+3
| * | | | | | | netfilter: nf_conntrack_standalone: Fix set-but-unused variables.David S. Miller2011-04-171-1/+1
| * | | | | | | netfilter: nfnetlink_log: Fix set-but-unused variables.David S. Miller2011-04-171-2/+0
* | | | | | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-05-192-16/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-9/+2
| * | | | | | | net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | IPVS: fix netns if reading ip_vs_* procfs entriesHans Schillstrom2011-05-153-6/+6
| |_|_|/ / / |/| | | | |
* | | | | | netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0Pablo Neira Ayuso2011-05-101-5/+0
* | | | | | netfilter: IPv6: fix DSCP mangle codeFernando Luis Vazquez Cao2011-05-101-1/+1
* | | | | | IPVS: init and cleanup restructuringHans Schillstrom2011-05-107-80/+206
* | | | | | IPVS: Change of socket usage to enable name space exit.Hans Schillstrom2011-05-102-22/+38
* | | | | | netfilter: fix ebtables compat supportEric Dumazet2011-05-101-2/+2
* | | | | | netfilter: ctnetlink: fix timestamp support for new conntracksPablo Neira Ayuso2011-05-101-0/+4
|/ / / / /
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-193-10/+30
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | netfilter: ipset: Fix the order of listing of setsJozsef Kadlecsik2011-04-191-8/+10
| * | | netfilter: ipset: set match and SET target fixesJozsef Kadlecsik2011-04-131-2/+16
| * | | netfilter: ipset: bitmap:ip,mac type requires "src" for MACJozsef Kadlecsik2011-04-131-0/+4
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-1112-106/+132
|\ \ \ \ | |/ / /
| * | | netfilter: xt_conntrack: fix inverted conntrack direction testFlorian Westphal2011-04-041-1/+1
| * | | netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->routeFlorian Westphal2011-04-042-15/+28
| * | | netfilter: af_info: add 'strict' parameter to limit lookup to .oifFlorian Westphal2011-04-042-5/+5
| * | | netfilter: af_info: add network namespace parameter to route hookFlorian Westphal2011-04-042-5/+5
| * | | IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()Hans Schillstrom2011-04-041-1/+1
| * | | netfilter: h323: bug in parsing of ASN1 SEQOF fieldDavid Sterba2011-04-041-1/+1
| * | | netfilter: ipset: references are protected by rwlock instead of mutexJozsef Kadlecsik2011-04-045-53/+71
| * | | netfilter: ipset: list:set timeout variant fixesJozsef Kadlecsik2011-04-041-29/+24
| |/ /
* | | Fix common misspellingsLucas De Marchi2011-03-3110-17/+17
|/ /
* | IPVS: Use global mutex in ip_vs_app.cSimon Horman2011-03-211-13/+10
* | ipvs: fix a typo in __ip_vs_control_init()Eric Dumazet2011-03-211-1/+1
* | netfilter: ipset: fix checking the type revision at create commandJozsef Kadlecsik2011-03-201-5/+17
OpenPOWER on IntegriCloud