diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-17 01:21:51 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-17 01:21:51 +0400 |
| commit | e54740e6d7093e49ebdfb1b26d4202a05fb32c06 (patch) | |
| tree | 758fff32453063fe0ddf8bf535a049a675043b06 /net/openvswitch/datapath.h | |
| parent | ad2ebb3d4dd244f9fd6b24f523b06134e571ae92 (diff) | |
| parent | 944df8ae84d88f5e8eb027990dad2cfa4fbe4be5 (diff) | |
| download | linux-e54740e6d7093e49ebdfb1b26d4202a05fb32c06.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A set of OVS changes for net-next/3.16.
The major change here is a switch from per-CPU to per-NUMA flow
statistics. This improves scalability by reducing kernel overhead
in flow setup and maintenance.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/datapath.h')
| -rw-r--r-- | net/openvswitch/datapath.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 05317380fc03..7ede507500d7 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -194,7 +194,9 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq, int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb); void ovs_dp_notify_wq(struct work_struct *work); -#define OVS_NLERR(fmt, ...) \ - pr_info_once("netlink: " fmt, ##__VA_ARGS__) - +#define OVS_NLERR(fmt, ...) \ +do { \ + if (net_ratelimit()) \ + pr_info("netlink: " fmt, ##__VA_ARGS__); \ +} while (0) #endif /* datapath.h */ |