diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-07 19:39:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-07 19:39:34 -0700 |
| commit | edc1bb0bd7d409f62ed7ba462ca5313be95cbed3 (patch) | |
| tree | 1b3bd0ce4f3041365d31495fba900d1dccf9da55 /net/openvswitch/flow.h | |
| parent | 11ef7a8996d5d433c9cd75d80651297eccbf6d42 (diff) | |
| parent | 4a46b24e147dfa9b858026da02cad0bdd4e149d2 (diff) | |
Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch
Pravin B Shelar says:
====================
Open vSwitch
A set of fixes for net.
First bug is related flow-table management. Second one is in sample
action. Third is related flow stats and last one add gre-err handler for ovs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.h')
| -rw-r--r-- | net/openvswitch/flow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index ac395d2cd82..5e5aaed3a85 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013 Nicira, Inc. + * Copyright (c) 2007-2014 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -180,7 +180,8 @@ struct arp_eth_header { unsigned char ar_tip[4]; /* target IP address */ } __packed; -void ovs_flow_stats_update(struct sw_flow *, struct sk_buff *); +void ovs_flow_stats_update(struct sw_flow *, __be16 tcp_flags, + struct sk_buff *); void ovs_flow_stats_get(const struct sw_flow *, struct ovs_flow_stats *, unsigned long *used, __be16 *tcp_flags); void ovs_flow_stats_clear(struct sw_flow *); |