summaryrefslogtreecommitdiffstats
path: root/include/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* atomic: use <linux/atomic.h>Arun Sharma2011-07-261-1/+1
* netfilter: nf_nat: avoid double seq_adjust for loopbackJulian Anastasov2011-06-161-0/+6
* net: Remove __KERNEL__ cpp checks from include/netDavid S. Miller2011-04-243-10/+0
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-191-11/+1
|\
| * netfilter: tproxy: do not assign timewait sockets to skb->skFlorian Westphal2011-02-171-11/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-02-041-3/+0
|\|
| * netfilter: ecache: always set events bits, filter them laterPablo Neira Ayuso2011-02-011-3/+0
| * netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2011-01-122-10/+10
* | netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=nPatrick McHardy2011-01-201-0/+12
* | netfilter: nf_conntrack_tstamp: add flow-based timestamp extensionPablo Neira Ayuso2011-01-192-0/+57
* | netfilter: nf_conntrack: nf_conntrack snmp helperJiri Olsa2011-01-181-0/+6
* | netfilter: nf_nat: fix conversion to non-atomic bit opsChangli Gao2011-01-181-2/+2
* | netfilter: nf_conntrack: use is_vmalloc_addr()Patrick McHardy2011-01-141-2/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Simon Horman2011-01-131-0/+2
|\|
| * netfilter: fix the race when initializing nf_ct_expect_hash_rndChangli Gao2011-01-061-0/+2
* | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2010-12-152-10/+10
* | netfilter: add __rcu annotationsEric Dumazet2010-11-152-3/+3
* | netfilter: nf_nat: define nat_pptp_info as neededChangli Gao2010-11-151-0/+2
* | netfilter: ct_extend: define NF_CT_EXT_* as neededChangli Gao2010-11-153-0/+18
* | netfilter: nf_nat: don't use atomic bit operationChangli Gao2010-11-151-2/+2
* | netfilter: nf_conntrack: define ct_*_info as neededChangli Gao2010-11-151-0/+13
* | netfilter: nf_conntrack: don't always initialize ct->protoChangli Gao2010-11-121-3/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-235-10/+257
|\
| * tproxy: added IPv6 socket lookup function to nf_tproxy_coreBalazs Scheidler2010-10-211-1/+71
| * tproxy: split off ipv6 defragmentation to a separate moduleBalazs Scheidler2010-10-211-0/+6
| * tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()Balazs Scheidler2010-10-211-2/+114
| * tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the...Balazs Scheidler2010-10-211-1/+5
| * netfilter: ctnetlink: add expectation deletion eventsPablo Neira Ayuso2010-10-191-1/+7
| * netfilter: add missing xt_log.h filePatrick McHardy2010-10-041-0/+54
| * netfilter: nf_nat: make find/put staticStephen Hemminger2010-10-041-3/+0
| * netfilter: ctnetlink: add support for user-space expectation helpersPablo Neira Ayuso2010-09-281-0/+1
| * netfilter: ctnetlink: allow to specify the expectation flagsPablo Neira Ayuso2010-09-221-3/+0
* | net/netfilter: __rcu annotationsArnd Bergmann2010-08-191-1/+1
|/
* netfilter: nf_nat: make unique_tuple return voidChangli Gao2010-08-021-4/+4
* netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-021-2/+7
* nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-spacePablo Neira Ayuso2010-07-151-0/+2
* netfilter: xt_connbytes: Force CT accounting to be enabledTim Gardner2010-06-251-0/+12
* netfilter: nf_nat: support user-specified SNAT rules in LOCAL_INPatrick McHardy2010-06-171-2/+0
* Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-06-152-5/+2
|\
| * pkt_sched: gen_kill_estimator() rcu fixesEric Dumazet2010-06-111-0/+1
| * net: CONFIG_NET_NS reductionEric Dumazet2010-06-021-5/+1
* | netfilter: nf_conntrack: per_cpu untrackingEric Dumazet2010-06-091-3/+2
* | netfilter: nf_conntrack: IPS_UNTRACKED bitEric Dumazet2010-06-082-4/+10
* | netfilter: xt_rateest: Better struct xt_rateest layoutEric Dumazet2010-06-081-3/+7
|/
* netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_g...Joerg Marx2010-05-201-1/+1
* include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-301-0/+2
* netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=nPatrick McHardy2010-02-181-2/+4
* netfilter: nf_conntrack: add support for "conntrack zones"Patrick McHardy2010-02-155-6/+36
* netfilter: nf_conntrack: pass template to l4proto ->error() handlerPatrick McHardy2010-02-151-2/+2
* netfilter: nf_conntrack: elegantly simplify nf_ct_exp_net()Alexey Dobriyan2010-02-121-5/+1