]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tc_action-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Aug 2016 23:27:58 +0000 (19:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Aug 2016 23:27:58 +0000 (19:27 -0400)
commitba287efeecdd9bd23b0b74a769dd5be0189c3c8f
tree4caaedaeea88314553924cc20110e650eb5afe16
parentcd4d03879d9bc8d7313448be3088a37d517d4b29
parenta9124e986a04b3cb1a9d26fd8dc19c9d91116fcd
Merge branch 'tc_action-fixes'

Cong Wang says:

====================
net_sched: tc action fixes and updates

This patchset fixes a few regressions caused by the previous
code refactor and more. Thanks to Jamal for catching them!

Note, patch 3/7 and 4/7 are not strictly necessary for this patchset,
I just want to carry them together.

---
v4: adjust an indention for Jamal
    add two more patches

v3: avoid list for fast path, suggested by Jamal

v2: replace flex_array with regular dynamic array
    keep tcf_action_stats_update() in act_api.h
    fix macro typos found by Amir
====================

Signed-off-by: David S. Miller <davem@davemloft.net>