]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'net_sched'
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 00:23:53 +0000 (19:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 00:23:53 +0000 (19:23 -0500)
commit02d7c0d42d5f611e8060f1f45531d232fef05791
tree1b24773d7fc90d14ecc682d407e1b2560e755c77
parent2fb5ec6a7ddc60cd6a1557ef6c67f0ff74871d91
parent0fa8e78d6c819e3d500c8fc0190f6a1aa9985f3a
Merge branch 'net_sched'

Cong Wang says:

====================
net_sched: act: more cleanup and improvement

v2 -> v3:
* fix a mis-splitted patch
* keep hinfo as a pointer in ops

v1 -> v2:
* Fix a bug noticed by Jamal
* Drop patches already merged into net-next
* Add patch 5/5

Patches are cleanup's for the structures of tc actions, except patch 4
which is an improvement.

See each patch for details.
====================

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>