summaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-07-031-4/+8
|\
| * netfilter: ipt_ULOG: fix incorrect setting of ulog timerGao feng2013-06-241-4/+8
* | net: Convert uses of typedef ctl_table to struct ctl_tableJoe Perches2013-06-131-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-06-062-1/+7
|\ \
| * | netfilter: {ipt,ebt}_ULOG: rise warning on deprecationPablo Neira Ayuso2013-05-232-1/+7
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-051-2/+4
|\ \ \ | | |/ | |/|
| * | netfilter: ipt_ULOG: fix non-null terminated string in the nf_log pathChen Gang2013-05-231-2/+4
* | | net: always pass struct netdev_notifier_info to netdevice notifiersCong Wang2013-05-281-1/+4
* | | net: pass info struct via netdevice notifierJiri Pirko2013-05-281-1/+1
|/ /
* | netfilter: log: netns NULL ptr bug when calling from conntrackHans Schillstrom2013-05-151-5/+8
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-05-011-5/+5
|\
| * proc: Supply a function to remove a proc entry by PDEDavid Howells2013-05-011-2/+2
| * procfs: new helper - PDE_DATA(inode)Al Viro2013-04-091-3/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-221-1/+7
|\ \
| * | netfilter: xt_rpfilter: skip locally generated broadcast/multicast, tooFlorian Westphal2013-04-191-1/+7
| |/
* | netfilter: xt_rpfilter: depend on raw or mangle tableFlorian Westphal2013-04-191-1/+1
* | netfilter: add my copyright statementsPatrick McHardy2013-04-1810-0/+13
* | netfilter: nat: propagate errors from xfrm_me_harder()Patrick McHardy2013-04-081-6/+11
* | netfilter: ipv4: propagate routing errors from ip_route_me_harder()Patrick McHardy2013-04-082-5/+10
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-04-073-49/+97
|\ \
| * | netfilter: ipt_ULOG: add net namespace support for ipt_ULOGGao feng2013-04-051-40/+89
| * | netfilter: nf_log: prepare net namespace support for loggersGao feng2013-04-052-5/+6
| * | netfilter: use IS_ENABLE to replace if defined in TRACE targetGao feng2013-04-021-4/+2
* | | net-next: replace obsolete NLMSG_* with type safe nlmsg_*Hong zhi guo2013-03-281-2/+2
|/ /
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-03-251-3/+1
|\ \ | |/ |/|
| * ipv4: netfilter: use PTR_RET instead of IS_ERR + PTR_ERRSilviu-Mihai Popescu2013-03-151-3/+1
* | netfilter: remove unused "config IP_NF_QUEUE"Paul Bolle2013-03-201-13/+0
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-02-261-1/+1
|\
| * new helper: file_inode(file)Al Viro2013-02-221-1/+1
* | Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-2/+2
|\ \
| * | net/ipv4/netfilter: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-2/+2
| |/
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-02-181-8/+2
|\ \
| * | netfilter: nf_ct_helper: better logging for dropped packetsPablo Neira Ayuso2013-02-191-8/+2
* | | net: proc: change proc_net_remove to remove_proc_entryGao feng2013-02-181-4/+4
* | | net: proc: change proc_net_fops_create to proc_createGao feng2013-02-181-3/+3
|/ /
* | net: remove redundant check for timer pending state before del_timerYing Xue2013-02-041-8/+4
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-01-271-28/+54
|\ \
| * | netfilter: nf_conntrack: refactor l4proto support for netnsGao feng2013-01-231-22/+40
| * | netfilter: nf_conntrack: refactor l3proto support for netnsGao feng2013-01-231-7/+15
| |/
* | netfilter: Use IS_ERR_OR_NULL().YOSHIFUJI Hideaki / 吉藤英明2013-01-222-10/+10
|/
* netfilter: nf_nat: Also handle non-ESTABLISHED routing changes in MASQUERADEAndrew Collins2012-12-161-5/+10
* netfilter: ip[6]t_REJECT: fix wrong transport header pointer in TCP resetMukund Jampala2012-12-161-0/+1
* net: remove obsolete simple_strto<foo>Abhijit Pawar2012-12-101-2/+7
* netfilter: nf_nat: Handle routing changes in MASQUERADE targetJozsef Kadlecsik2012-12-031-0/+4
* net: Allow userns root to control ipv4Eric W. Biederman2012-11-182-8/+8
* Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-11-161-3/+1
|\
| * netfilter: nf_nat: use PTR_RETWu Fengguang2012-10-291-3/+1
* | netfilter: nf_nat: don't check for port change on ICMP tuplesUlrich Weber2012-10-281-1/+3
|/
* netfilter: combine ipt_REDIRECT and ip6t_REDIRECTJan Engelhardt2012-09-213-121/+5
* netfilter: combine ipt_NETMAP and ip6t_NETMAPJan Engelhardt2012-09-213-108/+5
OpenPOWER on IntegriCloud