Pablo Neira Ayuso 81bf1c64e7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2015-08-21 06:09:05 +02:00

..

act_api.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-07-31 23:52:20 -07:00

act_bpf.c

act_bpf: properly support late binding of bpf action to a classifier

2015-08-03 16:05:56 -07:00

act_connmark.c

netfilter: nf_conntrack: add direction support for zones

2015-08-18 01:22:50 +02:00

act_csum.c

net: sched: add percpu stats to actions

2015-07-08 13:50:41 -07:00

act_gact.c

net_sched: act_gact: remove spinlock in fast path

2015-07-08 13:50:42 -07:00

act_ipt.c

net: sched: add percpu stats to actions

2015-07-08 13:50:41 -07:00

act_mirred.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-08-13 16:23:11 -07:00

act_nat.c

net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool

2015-08-17 21:33:06 -07:00

act_pedit.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-07-31 23:52:20 -07:00

act_police.c

sched: fix act file names in header comment

2014-11-06 15:04:41 -05:00

act_simple.c

net: sched: add percpu stats to actions

2015-07-08 13:50:41 -07:00

act_skbedit.c

net: sched: add percpu stats to actions

2015-07-08 13:50:41 -07:00

act_vlan.c

net: sched: add percpu stats to actions

2015-07-08 13:50:41 -07:00

cls_api.c

net: sched: fix call_rcu() race on classifier module unloads

2015-05-21 18:48:18 -04:00

cls_basic.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_bpf.c

sched: cls_bpf: fix panic on filter replace

2015-07-21 00:25:02 -07:00

cls_cgroup.c

cls_cgroup: factor out classid retrieval

2015-07-20 12:41:30 -07:00

cls_flow.c

sched: cls_flow: fix panic on filter replace

2015-07-21 00:25:03 -07:00

cls_flower.c

sched: cls_flower: fix panic on filter replace

2015-07-21 00:25:03 -07:00

cls_fw.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_route.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_rsvp6.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.h

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_tcindex.c

net_sched: destroy proto tp when all filters are gone

2015-03-09 15:35:55 -04:00

cls_u32.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-20 18:51:09 -04:00

em_canid.c

net: sched: remove tcf_proto from ematch calls

2014-10-06 18:02:32 -04:00

em_cmp.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

em_ipset.c

net: sched: Simplify em_ipset_match

2015-06-18 21:14:28 +02:00

em_meta.c

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13 17:51:08 -05:00

em_nbyte.c

net: sched: remove tcf_proto from ematch calls

2014-10-06 18:02:32 -04:00

em_text.c

net: Remove state argument from skb_find_text()

2015-02-22 15:59:54 -05:00

em_u32.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

ematch.c

ematch: Fix auto-loading of ematch modules.

2015-02-20 15:30:56 -05:00

Kconfig

net: add CONFIG_NET_INGRESS to enable ingress filtering

2015-05-14 01:10:05 -04:00

Makefile

tc: introduce Flower classifier

2015-05-13 15:19:48 -04:00

sch_api.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

sch_atm.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_blackhole.c

pkt_sched: Add qdisc->ops->peek() implementation.

2008-10-31 00:45:55 -07:00

sch_cbq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_choke.c

sch_choke: drop all packets in queue during reset

2015-07-24 22:57:15 -07:00

sch_codel.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-05-13 14:31:43 -04:00

sch_drr.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_dsmark.c

net: sched: fix skb->protocol use in case of accelerated vlan path

2015-01-13 17:51:08 -05:00

sch_fifo.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_fq_codel.c

fq_codel: explicitly reset flows in ->reset()

2015-08-02 17:20:01 -07:00

sch_fq.c

pkt_sched: fq: correct spelling of locally

2015-04-01 22:52:29 -04:00

sch_generic.c

net: sch_generic: react upon IFF_NO_QUEUE flag

2015-08-17 11:50:18 -07:00

sch_gred.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_hfsc.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_hhf.c

sched: Call skb_get_hash_perturb in sch_hhf

2015-05-04 00:09:08 -04:00

sch_htb.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_ingress.c

net: sched: further simplify handle_ing

2015-05-11 11:10:35 -04:00

sch_mq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_mqprio.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_multiq.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_netem.c

net: sched: deprecate enqueue_root()

2015-05-11 14:17:32 -04:00

sch_pie.c

sch_pie: schedule the timer after all init succeed

2014-10-29 14:28:01 -04:00

sch_plug.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_prio.c

net: sched: enable per cpu qstats

2014-09-30 01:02:26 -04:00

sch_qfq.c

pkt_sched: sch_qfq: remove unused member of struct qfq_sched

2015-07-15 17:21:31 -07:00

sch_red.c

net: sched: implement qstat helper routines

2014-09-30 01:02:26 -04:00

sch_sfb.c

net: sched: drop all special handling of tx_queue_len == 0

2015-08-18 11:55:08 -07:00

sch_sfq.c

net_sched: fix a use-after-free in sfq

2015-07-15 21:36:34 -07:00

sch_tbf.c

net: sched: avoid costly atomic operation in fq_dequeue()

2014-10-06 00:55:10 -04:00

sch_teql.c

net: sched: fix skb->protocol use in case of accelerated vlan path

2015-01-13 17:51:08 -05:00