Skip to content

Commit 5ca1ba4

Browse files
author
Pravin B Shelar
committed
openvswitch: Remove Linux bridge compatibility.
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 <pshelar@nicira.com> Acked-by: Jesse Gross <jesse@nicira.com>
1 parent a8643e4 commit 5ca1ba4

62 files changed

Lines changed: 176 additions & 3256 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

FAQ

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ Q: What features are not available in the Open vSwitch kernel datapath
160160
A: The kernel module in upstream Linux 3.3 and later does not include
161161
the following features:
162162

163-
- Bridge compatibility, that is, support for the ovs-brcompatd
164-
daemon that (if you enable it) lets "brctl" and other Linux
165-
bridge tools transparently work with Open vSwitch instead.
166-
167-
We do not expect bridge compatibility to ever be available in
168-
upstream Linux. If you need bridge compatibility, use the
169-
kernel module from the Open vSwitch distribution instead of the
170-
upstream Linux kernel module.
171-
172163
- Tunnel virtual ports, that is, interfaces with type "gre",
173164
"ipsec_gre", "capwap". It is possible to create tunnels in
174165
Linux and attach them to Open vSwitch as system devices.

INSTALL.Libvirt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
====================================
33

44
This document describes how to use Open vSwitch with Libvirt 0.9.11 or
5-
later. The Open vSwitch support in Libvirt 0.9.11 eliminates the need to
6-
use OVS Linux Bridge compatibility layer (brcompatd) and interface up/down
7-
scripts. This document assumes that you followed INSTALL or installed
5+
later. This document assumes that you followed INSTALL or installed
86
Open vSwitch from distribution packaging such as a .deb or .rpm. The Open
97
vSwitch support is included by default in Libvirt 0.9.11. Consult
108
www.libvirt.org for instructions on how to build the latest Libvirt, if your

INSTALL.bridge

Lines changed: 0 additions & 61 deletions
This file was deleted.

Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ EXTRA_DIST = \
5050
INSTALL.RHEL \
5151
INSTALL.SSL \
5252
INSTALL.XenServer \
53-
INSTALL.bridge \
5453
INSTALL.userspace \
5554
IntegrationGuide \
5655
NOTICE \

README

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ vSwitch supports the following features:
2828
* 802.1ag connectivity fault management
2929
* OpenFlow 1.0 plus numerous extensions
3030
* Transactional configuration database with C and Python bindings
31-
* Compatibility layer for Linux bridging code
3231
* High-performance forwarding using a Linux kernel module
3332

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

55-
* ovs-brcompatd, a daemon that allows ovs-vswitchd to act as a
56-
drop-in replacement for the Linux bridge in many environments,
57-
along with a companion Linux kernel module to intercept bridge
58-
ioctls.
59-
6054
* ovs-dpctl, a tool for configuring the switch kernel module.
6155

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

10498
- ...with Libvirt, read INSTALL.Libvirt.
10599

106-
- ...as a drop-in replacement for the Linux bridge, read
107-
INSTALL.bridge.
108-
109100
- ...without using a kernel module, read INSTALL.userspace.
110101

111102
For answers to common questions, read FAQ.

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ OVS_CHECK_SOCKET_LIBS
7373
OVS_CHECK_LINKER_SECTIONS
7474
OVS_CHECK_XENSERVER_VERSION
7575
OVS_CHECK_GROFF
76-
OVS_CHECK_BRCOMPAT
7776
OVS_CHECK_GNU_MAKE
7877
OVS_CHECK_CACHE_TIME
7978

datapath/Modules.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Some modules should be built and distributed, e.g. openvswitch.
22
#
3-
# Some modules should be distributed but not built, e.g. we do not build
4-
# brcompat if configured without it
5-
#
63
# Some modules should be built but not distributed, e.g. third-party
74
# hwtable modules.
85
both_modules = openvswitch
@@ -14,15 +11,12 @@ openvswitch_sources = \
1411
checksum.c \
1512
datapath.c \
1613
dp_notify.c \
17-
dp_sysfs_dp.c \
18-
dp_sysfs_if.c \
1914
flow.c \
2015
genl_exec.c \
2116
tunnel.c \
2217
vlan.c \
2318
vport.c \
2419
vport-capwap.c \
25-
vport-generic.c \
2620
vport-gre.c \
2721
vport-internal_dev.c \
2822
vport-netdev.c \
@@ -33,14 +27,12 @@ openvswitch_headers = \
3327
checksum.h \
3428
compat.h \
3529
datapath.h \
36-
dp_sysfs.h \
3730
flow.h \
3831
genl_exec.h \
3932
tunnel.h \
4033
vlan.h \
4134
vport.h \
4235
vport-capwap.h \
43-
vport-generic.h \
4436
vport-internal_dev.h \
4537
vport-netdev.h
4638

0 commit comments

Comments
 (0)