Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch

Browse source

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>

...

This commit is contained in:

David S. Miller 2014-07-07 19:39:34 -07:00

parent 11ef7a8996 4a46b24e14

commit edc1bb0bd7

7 changed files with 55 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/openvswitch/actions.c

View file

27

net/openvswitch/datapath.c

View file

4

net/openvswitch/flow.c

View file

5

net/openvswitch/flow.h

View file

16

net/openvswitch/flow_table.c

View file

3

net/openvswitch/flow_table.h

View file

17

net/openvswitch/vport-gre.c

View file