FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 17:33:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56a4342dfe
linux/net/sched
History
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
act_api.c net_sched: act: action flushing missaccounting 2014-01-06 16:46:56 -05:00
act_csum.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_gact.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_ipt.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_mirred.c net_sched: fix a regression in tc actions 2013-12-20 17:06:27 -05:00
act_nat.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_pedit.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_police.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_simple.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
act_skbedit.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
cls_api.c net_sched: Remove unnecessary checks for act->ops 2014-01-06 16:46:32 -05:00
cls_basic.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_bpf.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_cgroup.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 2014-01-05 20:18:50 -05:00
cls_flow.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_fw.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_route.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_tcindex.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
cls_u32.c net_sched: cls: refactor out struct tcf_ext_map 2013-12-18 12:52:07 -05:00
em_canid.c
em_cmp.c
em_ipset.c em_ipset: use dev_net() accessor 2013-10-18 16:23:06 -04:00
em_meta.c net: Change skb_get_rxhash to skb_get_hash 2013-12-17 16:36:21 -05:00
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig net: pkt_sched: PIE AQM scheme 2014-01-06 15:13:01 -05:00
Makefile net: pkt_sched: PIE AQM scheme 2014-01-06 15:13:01 -05:00
sch_api.c net, sch: fix the typo in register_qdisc() 2013-12-31 16:44:10 -05:00
sch_atm.c net_sched: info leak in atm_tc_dump_class() 2013-07-31 15:04:19 -07:00
sch_blackhole.c
sch_cbq.c net_sched: replace pr_warning with pr_warn 2013-12-31 13:50:56 -05:00
sch_choke.c treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks 2013-08-20 13:06:40 +02:00
sch_codel.c
sch_drr.c net_sched: add 64bit rate estimators 2013-06-11 02:51:03 -07:00
sch_dsmark.c sch_dsmark: use correct func name in print messages 2013-12-31 13:50:57 -05:00
sch_fifo.c
sch_fq_codel.c net: fq_codel: Fix off-by-one error 2013-03-29 15:32:23 -04:00
sch_fq.c net: Change skb_get_rxhash to skb_get_hash 2013-12-17 16:36:21 -05:00
sch_generic.c pkt_sched: set root qdisc before change() in attach_default_qdiscs() 2013-12-14 01:20:06 -05:00
sch_gred.c net_sched: replace pr_warning with pr_warn 2013-12-31 13:50:56 -05:00
sch_hfsc.c net_sched: add 64bit rate estimators 2013-06-11 02:51:03 -07:00
sch_hhf.c hhf: make qdisc ops static 2013-12-26 13:29:35 -05:00
sch_htb.c sch_htb: use /* comments 2013-12-31 13:50:57 -05:00
sch_ingress.c
sch_mq.c pkt_sched: give visibility to mq slave qdiscs 2013-12-09 19:54:47 -05:00
sch_mqprio.c pkt_sched: give visibility to mq slave qdiscs 2013-12-09 19:54:47 -05:00
sch_multiq.c net/*: Fix FSF address in file headers 2013-12-06 12:37:57 -05:00
sch_netem.c sch_netem: support of 64bit rates 2013-12-31 14:31:44 -05:00
sch_pie.c net: pkt_sched: PIE AQM scheme 2014-01-06 15:13:01 -05:00
sch_plug.c
sch_prio.c
sch_qfq.c pkt_sched: sch_qfq: remove a source of high packet delay/jitter 2013-07-18 13:02:00 -07:00
sch_red.c
sch_sfb.c
sch_sfq.c net_sched: sfq: put sfq_unlink in a do - while loop 2013-12-10 22:44:52 -05:00
sch_tbf.c sch_tbf: add TBF_BURST/TBF_PBURST attribute 2013-12-26 13:54:22 -05:00
sch_teql.c