aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-25
|\
| * netfilter: nf_nat: missing condition in nf_xfrm_me_harder()Dan Carpenter2013-04-24
| * ipvs: Use network byte order for sync message sizeSimon Horman2013-04-22
| * ipvs: off by one in set_sctp_state()Dan Carpenter2013-04-22
| * ipvs: Use min3() in ip_vs_dbg_callid()Simon Horman2013-04-22
| * ipvs: Avoid shadowing net variable in ip_vs_leave()Simon Horman2013-04-22
| * ipvs: fix sparse warnings for some parametersJulian Anastasov2013-04-22
| * ipvs: fix sparse warnings in lblc and lblcrJulian Anastasov2013-04-22
| * ipvs: fix the remaining sparse warnings in ip_vs_ctl.cJulian Anastasov2013-04-22
| * ipvs: fix sparse warnings for ip_vs_conn listingJulian Anastasov2013-04-22
| * ipvs: properly dereference dest_dst in ip_vs_forget_devJulian Anastasov2013-04-22
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-22
|\ \ | |/ |/|
| * netfilter: ipset: bitmap:ip,mac: fix listing with timeoutJozsef Kadlecsik2013-04-18
| * netfilter: nf_nat: fix race when unloading protocol modulesFlorian Westphal2013-04-12
| * netfilter: ipset: hash:*net*: nomatch flag not excluded on set resizeJozsef Kadlecsik2013-04-09
| * netfilter: ipset: list:set: fix reference counter updateJozsef Kadlecsik2013-04-09
| * netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the pa...Patrick McHardy2013-04-06
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-19
|\ \
| * | netfilter: add my copyright statementsPatrick McHardy2013-04-18
| * | netfilter: nat: propagate errors from xfrm_me_harder()Patrick McHardy2013-04-08
* | | nfnetlink: add support for memory mapped netlinkPatrick McHardy2013-04-19
* | | netfilter: rename netlink related "pid" variables to "portid"Patrick McHardy2013-04-19
* | | netlink: rename ssk to sk in struct netlink_skb_paramsPatrick McHardy2013-04-19
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-07
|\|
| * netfilter: nf_conntrack: fix error return codeWei Yongjun2013-03-27
| * netfilter: nfnetlink_acct: return -EINVAL if object name is emptyPablo Neira Ayuso2013-03-25
| * netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()Wei Yongjun2013-03-25
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-04-07
|\ \
| * | netfilter: remove unneeded variable proc_net_netfilterPablo Neira Ayuso2013-04-05
| * | netfilter: nfnetlink_queue: add net namespace support for nfnetlink_queueGao feng2013-04-05
| * | netfilter: enable per netns support for nf_loggersGao feng2013-04-05
| * | netfilter: nfnetlink_log: add net namespace support for nfnetlink_logGao feng2013-04-05
| * | netfilter: xt_LOG: add net namespace support for xt_LOGGao feng2013-04-05
| * | netfilter: nf_log: prepare net namespace support for loggersGao feng2013-04-05
| * | netfilter: make /proc/net/netfilter pernetGao feng2013-04-05
| * | netfilter: xt_NFQUEUE: coalesce IPv4 and IPv6 hashingholger@eitzenberger.org2013-04-01
| * | netfilter: xt_NFQUEUE: introduce CPU fanoutholger@eitzenberger.org2013-04-01
| * | ipvs: do not disable bh for long timeJulian Anastasov2013-04-01
| * | ipvs: convert services to rcuJulian Anastasov2013-04-01
| * | ipvs: convert dests to rcuJulian Anastasov2013-04-01
| * | ipvs: convert sched_lock to spin lockJulian Anastasov2013-04-01
| * | ipvs: do not expect result from done_serviceJulian Anastasov2013-04-01
| * | ipvs: reorganize dest trashJulian Anastasov2013-04-01
| * | ipvs: convert wrr scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert wlc scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert sh scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert sed scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert rr scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert nq scheduler to rcuJulian Anastasov2013-04-01
| * | ipvs: convert lc scheduler to rcuJulian Anastasov2013-04-01