Merge branch 'Openvswitch-meter-action'
authorDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:37:08 +0000 (10:37 +0900)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:37:08 +0000 (10:37 +0900)
commitfd9080a39bede82a5123fa322ae9e3d7f0a93e72
tree758c1ad7b4613b907669ee97f0a8c89d24763a05
parentaef1e0d5dd3ca3acd7274c9179c8f7bf68170509
parentcd8a6c33693c1b89d2737ffdbf9611564e9ac907
Merge branch 'Openvswitch-meter-action'

Andy Zhou says:

====================
Openvswitch meter action

This patch series is the first attempt to add openvswitch
meter support. We have previously experimented with adding
metering support in nftables. However 1) It was not clear
how to expose a named nftables object cleanly, and 2)
the logic that implements metering is quite small, < 100 lines
of code.

With those two observations, it seems cleaner to add meter
support in the openvswitch module directly.

---

    v1(RFC)->v2:  remove unused code improve locking
  and other review comments
    v2 -> v3:     rebase
    v3 -> v4:     fix undefined "__udivdi3" references on 32 bit builds.
                  use div_u64() instead.
    v4 -> v5:     rebase
====================

Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>