summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-07-027-47/+42
|\
| * netfilter: complete the deprecation of CONFIG_NF_CT_ACCTTim Gardner2010-06-252-35/+1
| * netfilter: xt_connbytes: Force CT accounting to be enabledTim Gardner2010-06-251-0/+10
| * netfilter: fix simple typo in KConfig for netfiltert xt_TEEArnd Hannemann2010-06-221-1/+1
| * netfilter: xt_IDLETIMER needs kdev_t.hRandy Dunlap2010-06-221-0/+1
| * IPVS: one-packet schedulingNick Chalk2010-06-223-11/+29
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-231-0/+4
|\ \
| * | ipvs: Add missing locking during connection table hashing and unhashingSven Wegener2010-06-091-0/+4
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-06-1516-86/+444
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-06-158-73/+69
| |\ \
| * | | netfilter: xtables: idletimer target implementationLuciano Coelho2010-06-153-0/+327
| * | | netfilter: nfnetlink_log: RCU conversion, part 2Eric Dumazet2010-06-141-6/+12
| * | | netfilter: nfnetlink_log: RCU conversionEric Dumazet2010-06-091-22/+27
| * | | netfilter: nfnetlink_queue: some optimizationsEric Dumazet2010-06-091-19/+14
| * | | netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4...Shan Wei2010-06-091-1/+2
| * | | netfilter: nf_conntrack: per_cpu untrackingEric Dumazet2010-06-091-10/+26
| * | | netfilter: nf_conntrack: IPS_UNTRACKED bitEric Dumazet2010-06-089-22/+30
| * | | netfilter: xt_statistic: remove nth_lock spinlockEric Dumazet2010-06-011-10/+9
* | | | tcp: unify tcp flag macrosChangli Gao2010-06-152-23/+13
* | | | bridge: use rx_handler_data pointer to store net_bridge_port pointerJiri Pirko2010-06-152-4/+8
| |/ / |/| |
* | | pkt_sched: gen_kill_estimator() rcu fixesEric Dumazet2010-06-111-1/+11
* | | net-next: remove useless union keywordChangli Gao2010-06-105-54/+54
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-061-14/+3
|\ \ \ | | |/ | |/|
| * | netfilter: xtables: stackptr should be percpuEric Dumazet2010-05-311-10/+3
| * | netfilter: don't xt_jumpstack_alloc twice in xt_register_tableXiaotian Feng2010-05-311-4/+0
| |/
* | net: CONFIG_NET_NS reductionEric Dumazet2010-06-021-6/+2
|/
* xt_tee: use skb_dst_drop()Eric Dumazet2010-05-281-2/+2
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-202-8/+14
|\
| * netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_g...Joerg Marx2010-05-201-0/+10
| * netfilter: nf_ct_sip: handle non-linear skbsPatrick McHardy2010-05-141-8/+4
* | net: add a noref bit on skb dstEric Dumazet2010-05-171-0/+2
* | netfilter: xt_TEE depends on NF_CONNTRACKRandy Dunlap2010-05-141-0/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-1366-121/+118
|\ \ | |/
| * netfilter: remove unnecessary returns from void function()sJoe Perches2010-05-133-3/+0
| * netfilter: cleanup printk messagesStephen Hemminger2010-05-1313-27/+27
| * Merge branch 'master' of git://dev.medozas.de/linuxPatrick McHardy2010-05-1152-91/+91
| |\
| | * netfilter: xtables: change hotdrop pointer to direct modificationJan Engelhardt2010-05-119-16/+16
| | * netfilter: xtables: deconstify struct xt_action_param for matchesJan Engelhardt2010-05-1136-54/+46
| | * netfilter: xtables: substitute temporary defines by final nameJan Engelhardt2010-05-1152-73/+81
| | * netfilter: xtables: fix incorrect return codeJan Engelhardt2010-05-021-2/+2
* | | netfilter: xtables: add missing depends for xt_TEEJan Engelhardt2010-05-121-0/+1
|/ /
* | netfilter: use rcu_dereference_protected()Patrick McHardy2010-05-102-6/+26
* | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-05-101-1/+1
|\ \
| * | net: sk_sleep() helperEric Dumazet2010-04-201-1/+1
* | | netfilter: nf_conntrack_proto: fix warning with CONFIG_PROVE_RCUPatrick McHardy2010-05-101-1/+5
* | | netfilter: nf_ct_h323: switch "incomplete TPKT" message to pr_debug()Patrick McHardy2010-05-011-2/+1
| |/ |/|
* | netfilter: nf_conntrack: extend with extra stat counterJesper Dangaard Brouer2010-04-232-4/+7
* | netfilter: x_tables: move sleeping allocation outside BH-disabled regionJan Engelhardt2010-04-211-6/+6
* | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-04-2044-7/+50
|\ \ | |/
| * include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3042-2/+40
OpenPOWER on IntegriCloud