summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-259-49/+58
|\
| * netfilter: nf_nat: missing condition in nf_xfrm_me_harder()Dan Carpenter2013-04-251-0/+1
| * ipvs: Use network byte order for sync message sizeSimon Horman2013-04-231-13/+8
| * ipvs: off by one in set_sctp_state()Dan Carpenter2013-04-231-1/+1
| * ipvs: Use min3() in ip_vs_dbg_callid()Simon Horman2013-04-231-1/+2
| * ipvs: Avoid shadowing net variable in ip_vs_leave()Simon Horman2013-04-231-2/+2
| * ipvs: fix sparse warnings for some parametersJulian Anastasov2013-04-232-17/+26
| * ipvs: fix sparse warnings in lblc and lblcrJulian Anastasov2013-04-232-2/+2
| * ipvs: fix the remaining sparse warnings in ip_vs_ctl.cJulian Anastasov2013-04-231-4/+6
| * ipvs: fix sparse warnings for ip_vs_conn listingJulian Anastasov2013-04-231-8/+6
| * ipvs: properly dereference dest_dst in ip_vs_forget_devJulian Anastasov2013-04-231-1/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-228-45/+97
|\ \ | |/ |/|
| * netfilter: ipset: bitmap:ip,mac: fix listing with timeoutJozsef Kadlecsik2013-04-181-1/+5
| * netfilter: nf_nat: fix race when unloading protocol modulesFlorian Westphal2013-04-121-33/+7
| * netfilter: ipset: hash:*net*: nomatch flag not excluded on set resizeJozsef Kadlecsik2013-04-094-4/+76
| * netfilter: ipset: list:set: fix reference counter updateJozsef Kadlecsik2013-04-091-3/+7
| * netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the pa...Patrick McHardy2013-04-061-4/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-1927-8/+43
|\ \
| * | netfilter: add my copyright statementsPatrick McHardy2013-04-1826-4/+38
| * | netfilter: nat: propagate errors from xfrm_me_harder()Patrick McHardy2013-04-081-4/+5
* | | nfnetlink: add support for memory mapped netlinkPatrick McHardy2013-04-193-5/+15
* | | netfilter: rename netlink related "pid" variables to "portid"Patrick McHardy2013-04-193-14/+15
* | | netlink: rename ssk to sk in struct netlink_skb_paramsPatrick McHardy2013-04-191-1/+1
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-072-0/+3
|\ \ | |/
| * netfilter: nf_conntrack: fix error return codeWei Yongjun2013-03-271-0/+1
| * netfilter: nfnetlink_acct: return -EINVAL if object name is emptyPablo Neira Ayuso2013-03-251-0/+2
| * netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()Wei Yongjun2013-03-251-1/+3
* | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-04-0735-1841/+2014
|\ \
| * | netfilter: remove unneeded variable proc_net_netfilterPablo Neira Ayuso2013-04-051-12/+4
| * | netfilter: nfnetlink_queue: add net namespace support for nfnetlink_queueGao feng2013-04-051-60/+113
| * | netfilter: enable per netns support for nf_loggersGao feng2013-04-051-21/+0
| * | netfilter: nfnetlink_log: add net namespace support for nfnetlink_logGao feng2013-04-051-60/+117
| * | netfilter: xt_LOG: add net namespace support for xt_LOGGao feng2013-04-051-3/+49
| * | netfilter: nf_log: prepare net namespace support for loggersGao feng2013-04-058-82/+197
| * | netfilter: make /proc/net/netfilter pernetGao feng2013-04-051-4/+29
| * | netfilter: xt_NFQUEUE: coalesce IPv4 and IPv6 hashingholger@eitzenberger.org2013-04-021-20/+22
| * | netfilter: xt_NFQUEUE: introduce CPU fanoutholger@eitzenberger.org2013-04-021-2/+39
| * | ipvs: do not disable bh for long timeJulian Anastasov2013-04-0212-87/+64
| * | ipvs: convert services to rcuJulian Anastasov2013-04-0217-240/+177
| * | ipvs: convert dests to rcuJulian Anastasov2013-04-023-25/+26
| * | ipvs: convert sched_lock to spin lockJulian Anastasov2013-04-025-32/+32
| * | ipvs: do not expect result from done_serviceJulian Anastasov2013-04-027-28/+10
| * | ipvs: reorganize dest trashJulian Anastasov2013-04-021-74/+104
| * | ipvs: convert wrr scheduler to rcuJulian Anastasov2013-04-021-64/+103
| * | ipvs: convert wlc scheduler to rcuJulian Anastasov2013-04-021-2/+2
| * | ipvs: convert sh scheduler to rcuJulian Anastasov2013-04-021-36/+45
| * | ipvs: convert sed scheduler to rcuJulian Anastasov2013-04-021-2/+2
| * | ipvs: convert rr scheduler to rcuJulian Anastasov2013-04-021-20/+35
| * | ipvs: convert nq scheduler to rcuJulian Anastasov2013-04-021-1/+1
| * | ipvs: convert lc scheduler to rcuJulian Anastasov2013-04-021-1/+1
OpenPOWER on IntegriCloud