Jesse Gross 30444e981b openvswitch: Fix bad merge resolution. ...

git silently included an extra hunk in vport_cmd_set() during
automatic merging. This code is unreachable so it does not actually
introduce a problem but it is clearly incorrect.

Signed-off-by: Jesse Gross <jesse@nicira.com>

2013-08-14 15:48:02 -07:00

..

actions.c

openvswitch: Add tunneling interface.

2013-06-19 18:07:41 -07:00

datapath.c

openvswitch: Fix bad merge resolution.

2013-08-14 15:48:02 -07:00

datapath.h

openvswitch: Add gre tunnel support.

2013-06-19 18:07:42 -07:00

dp_notify.c

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

flow.c

openvswitch: Optimize flow key match for non tunnel flows.

2013-06-19 18:07:41 -07:00

flow.h

openvswitch: Add gre tunnel support.

2013-06-19 18:07:42 -07:00

Kconfig

openvswitch: Add Kconfig dependency on GRE-DEMUX.

2013-07-01 13:19:43 -07:00

Makefile

openvswitch: Add gre tunnel support.

2013-06-19 18:07:42 -07:00

vport-gre.c

openvswitch: Add Kconfig dependency on GRE-DEMUX.

2013-07-01 13:19:43 -07:00

vport-internal_dev.c

openvswitch: Add tunneling interface.

2013-06-19 18:07:41 -07:00

vport-internal_dev.h

openvswitch: Replace Nicira Networks.

2012-05-03 18:55:23 -07:00

vport-netdev.c

openvswitch: Add tunneling interface.

2013-06-19 18:07:41 -07:00

vport-netdev.h

openvswitch: Remove unused get_config vport op.

2013-06-14 15:09:09 -07:00

vport.c

openvswitch: Add Kconfig dependency on GRE-DEMUX.

2013-07-01 13:19:43 -07:00

vport.h

openvswitch: Add gre tunnel support.

2013-06-19 18:07:42 -07:00