Skip to content

Commit

Permalink
openvswitch: Remove Linux bridge compatibility.
Browse files Browse the repository at this point in the history
Currently brcompat does not work on master due to recent
datapath changes. We have decided to remove it as it is
not used very widely.

Signed-off-by: Pravin B Shelar <[email protected]>
Acked-by: Jesse Gross <[email protected]>
  • Loading branch information
Pravin B Shelar committed Dec 27, 2012
1 parent a8643e4 commit 5ca1ba4
Show file tree
Hide file tree
Showing 62 changed files with 176 additions and 3,256 deletions.
9 changes: 0 additions & 9 deletions FAQ
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,6 @@ Q: What features are not available in the Open vSwitch kernel datapath
A: The kernel module in upstream Linux 3.3 and later does not include
the following features:

- Bridge compatibility, that is, support for the ovs-brcompatd
daemon that (if you enable it) lets "brctl" and other Linux
bridge tools transparently work with Open vSwitch instead.

We do not expect bridge compatibility to ever be available in
upstream Linux. If you need bridge compatibility, use the
kernel module from the Open vSwitch distribution instead of the
upstream Linux kernel module.

- Tunnel virtual ports, that is, interfaces with type "gre",
"ipsec_gre", "capwap". It is possible to create tunnels in
Linux and attach them to Open vSwitch as system devices.
Expand Down
4 changes: 1 addition & 3 deletions INSTALL.Libvirt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
====================================

This document describes how to use Open vSwitch with Libvirt 0.9.11 or
later. The Open vSwitch support in Libvirt 0.9.11 eliminates the need to
use OVS Linux Bridge compatibility layer (brcompatd) and interface up/down
scripts. This document assumes that you followed INSTALL or installed
later. This document assumes that you followed INSTALL or installed
Open vSwitch from distribution packaging such as a .deb or .rpm. The Open
vSwitch support is included by default in Libvirt 0.9.11. Consult
www.libvirt.org for instructions on how to build the latest Libvirt, if your
Expand Down
61 changes: 0 additions & 61 deletions INSTALL.bridge

This file was deleted.

1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ EXTRA_DIST = \
INSTALL.RHEL \
INSTALL.SSL \
INSTALL.XenServer \
INSTALL.bridge \
INSTALL.userspace \
IntegrationGuide \
NOTICE \
Expand Down
9 changes: 0 additions & 9 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ vSwitch supports the following features:
* 802.1ag connectivity fault management
* OpenFlow 1.0 plus numerous extensions
* Transactional configuration database with C and Python bindings
* Compatibility layer for Linux bridging code
* High-performance forwarding using a Linux kernel module

The included Linux kernel module supports Linux 2.6.18 and up, with
Expand All @@ -52,11 +51,6 @@ The main components of this distribution are:
* ovsdb-server, a lightweight database server that ovs-vswitchd
queries to obtain its configuration.

* ovs-brcompatd, a daemon that allows ovs-vswitchd to act as a
drop-in replacement for the Linux bridge in many environments,
along with a companion Linux kernel module to intercept bridge
ioctls.

* ovs-dpctl, a tool for configuring the switch kernel module.

* Scripts and specs for building RPMs for Citrix XenServer and Red
Expand Down Expand Up @@ -103,9 +97,6 @@ To use Open vSwitch...

- ...with Libvirt, read INSTALL.Libvirt.

- ...as a drop-in replacement for the Linux bridge, read
INSTALL.bridge.

- ...without using a kernel module, read INSTALL.userspace.

For answers to common questions, read FAQ.
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ OVS_CHECK_SOCKET_LIBS
OVS_CHECK_LINKER_SECTIONS
OVS_CHECK_XENSERVER_VERSION
OVS_CHECK_GROFF
OVS_CHECK_BRCOMPAT
OVS_CHECK_GNU_MAKE
OVS_CHECK_CACHE_TIME

Expand Down
8 changes: 0 additions & 8 deletions datapath/Modules.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Some modules should be built and distributed, e.g. openvswitch.
#
# Some modules should be distributed but not built, e.g. we do not build
# brcompat if configured without it
#
# Some modules should be built but not distributed, e.g. third-party
# hwtable modules.
both_modules = openvswitch
Expand All @@ -14,15 +11,12 @@ openvswitch_sources = \
checksum.c \
datapath.c \
dp_notify.c \
dp_sysfs_dp.c \
dp_sysfs_if.c \
flow.c \
genl_exec.c \
tunnel.c \
vlan.c \
vport.c \
vport-capwap.c \
vport-generic.c \
vport-gre.c \
vport-internal_dev.c \
vport-netdev.c \
Expand All @@ -33,14 +27,12 @@ openvswitch_headers = \
checksum.h \
compat.h \
datapath.h \
dp_sysfs.h \
flow.h \
genl_exec.h \
tunnel.h \
vlan.h \
vport.h \
vport-capwap.h \
vport-generic.h \
vport-internal_dev.h \
vport-netdev.h

Expand Down
Loading

0 comments on commit 5ca1ba4

Please sign in to comment.