Skip to content

Commit 36e5d97

Browse files
blpblp
committed
ovs-vlan-bug-workaround: Remove.
This workaround only applied to kernels earlier than 2.6.37, but OVS only supports 3.10 and later. As the original author of this code, I won't miss it. Tested-by: Greg Rose <[email protected]> Reviewed-by: Greg Rose <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
1 parent 622ea8f commit 36e5d97

14 files changed

+3
-341
lines changed

Diff for: ‎Documentation/faq/vlan.rst

-40
Original file line numberDiff line numberDiff line change
@@ -77,46 +77,6 @@ Q: What's a VLAN?
7777

7878
Q: VLANs don't work.
7979

80-
A: Many drivers in Linux kernels before version 3.3 had VLAN-related bugs.
81-
If you are having problems with VLANs that you suspect to be driver
82-
related, then you have several options:
83-
84-
- Upgrade to Linux 3.3 or later.
85-
86-
- Build and install a fixed version of the particular driver that is
87-
causing trouble, if one is available.
88-
89-
- Use a NIC whose driver does not have VLAN problems.
90-
91-
- Use "VLAN splinters", a feature in Open vSwitch 1.4 upto 2.5 that works
92-
around bugs in kernel drivers. To enable VLAN splinters on interface
93-
eth0, use the command::
94-
95-
$ ovs-vsctl set interface eth0 other-config:enable-vlan-splinters=true
96-
97-
For VLAN splinters to be effective, Open vSwitch must know which VLANs
98-
are in use. See the "VLAN splinters" section in the Interface table in
99-
ovs-vswitchd.conf.db(5) for details on how Open vSwitch infers in-use
100-
VLANs.
101-
102-
VLAN splinters increase memory use and reduce performance, so use them
103-
only if needed.
104-
105-
- Apply the "vlan workaround" patch from the XenServer kernel patch queue,
106-
build Open vSwitch against this patched kernel, and then use
107-
ovs-vlan-bug-workaround(8) to enable the VLAN workaround for each
108-
interface whose driver is buggy.
109-
110-
(This is a nontrivial exercise, so this option is included only for
111-
completeness.)
112-
113-
It is not always easy to tell whether a Linux kernel driver has buggy VLAN
114-
support. The ovs-vlan-test(8) and ovs-test(8) utilities can help you test.
115-
See their manpages for details. Of the two utilities, ovs-test(8) is newer
116-
and more thorough, but ovs-vlan-test(8) may be easier to use.
117-
118-
Q: VLANs still don't work. I've tested the driver so I know that it's OK.
119-
12080
A: Do you have VLANs enabled on the physical switch that OVS is attached
12181
to? Make sure that the port is configured to trunk the VLAN or VLANs that
12282
you are using with OVS.

Diff for: ‎Documentation/ref/index.rst

-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ The remainder are still in roff format can be found below:
126126
- `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-testcontroller.8.pdf>`__
127127
- `(html) <http://www.openvswitch.org/support/dist-docs/ovs-testcontroller.8.html>`__
128128
- `(plain text) <http://www.openvswitch.org/support/dist-docs/ovs-testcontroller.8.txt>`__
129-
* - ovs-vlan-bug-workaround(8)
130-
- `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-vlan-bug-workaround.8.pdf>`__
131-
- `(html) <http://www.openvswitch.org/support/dist-docs/ovs-vlan-bug-workaround.8.html>`__
132-
- `(plain text) <http://www.openvswitch.org/support/dist-docs/ovs-vlan-bug-workaround.8.txt>`__
133129
* - ovs-vlan-test(8)
134130
- `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-vlan-test.8.pdf>`__
135131
- `(html) <http://www.openvswitch.org/support/dist-docs/ovs-vlan-test.8.html>`__

Diff for: ‎acinclude.m4

-2
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
847847
848848
OVS_GREP_IFELSE([$KSRC/include/net/sctp/checksum.h], [sctp_compute_cksum])
849849
850-
OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD],
851-
[OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])])
852850
OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_insert_tag_set_proto])
853851
OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [__vlan_insert_tag])
854852
OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_get_protocol])

Diff for: ‎manpages.mk

-10
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,6 @@ lib/vconn-active.man:
232232
lib/vconn-passive.man:
233233
lib/vlog.man:
234234

235-
utilities/ovs-vlan-bug-workaround.8: \
236-
utilities/ovs-vlan-bug-workaround.8.in \
237-
lib/common.man \
238-
lib/ovs.tmac \
239-
utilities/ovs-vlan-bugs.man
240-
utilities/ovs-vlan-bug-workaround.8.in:
241-
lib/common.man:
242-
lib/ovs.tmac:
243-
utilities/ovs-vlan-bugs.man:
244-
245235
utilities/ovs-vsctl.8: \
246236
utilities/ovs-vsctl.8.in \
247237
lib/common.man \

Diff for: ‎rhel/openvswitch-fedora.spec.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@ install -p -D -m 0755 \
268268
$RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-systemd-reload
269269

270270
# remove unpackaged files
271-
rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace \
272-
$RPM_BUILD_ROOT%{_sbindir}/ovs-vlan-bug-workaround \
273-
$RPM_BUILD_ROOT%{_mandir}/man8/ovs-vlan-bug-workaround.8
271+
rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace
274272

275273
%check
276274
%if %{with check}

Diff for: ‎rhel/openvswitch.spec.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ rm \
9999
$RPM_BUILD_ROOT/usr/bin/ovs-test \
100100
$RPM_BUILD_ROOT/usr/bin/ovs-l3ping \
101101
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \
102-
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \
103-
$RPM_BUILD_ROOT/usr/sbin/ovs-vlan-bug-workaround \
104-
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8
102+
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8
105103
(cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la)
106104
(cd "$RPM_BUILD_ROOT" && rm -rf usr/include)
107105

Diff for: ‎tests/interface-reconfigure.at

+1-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ EOF
3939
sbin/ip \
4040
sbin/update-issue \
4141
sbin/vconfig \
42-
usr/sbin/brctl \
43-
usr/sbin/ovs-vlan-bug-workaround
42+
usr/sbin/brctl
4443
do
4544
mkdir -p `dirname $utility`
4645
cat > $utility <<'EOF'
@@ -716,7 +715,6 @@ Applying changes to /etc/sysconfig/network configuration
716715
Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration
717716
/sbin/ip link set eth2 up mtu 1500
718717
/sbin/ethtool -K eth2 gro off lro off
719-
/usr/sbin/ovs-vlan-bug-workaround eth2 on
720718
/usr/bin/ovs-vsctl --timeout=20
721719
--with-iface --if-exists del-port eth2
722720
--may-exist add-br xenbr2
@@ -791,7 +789,6 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi3 configuration
791789
Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration
792790
/sbin/ip link set eth3 up mtu 1500
793791
/sbin/ethtool -K eth3 gro off lro off
794-
/usr/sbin/ovs-vlan-bug-workaround eth3 on
795792
/usr/bin/ovs-vsctl --timeout=20
796793
--with-iface --if-exists del-port eth3
797794
--may-exist add-br xenbr3
@@ -877,10 +874,8 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi1 configuration
877874
Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration
878875
/sbin/ip link set eth0 up mtu 1500
879876
/sbin/ethtool -K eth0 gro off lro off
880-
/usr/sbin/ovs-vlan-bug-workaround eth0 on
881877
/sbin/ip link set eth1 up mtu 1500
882878
/sbin/ethtool -K eth1 gro off lro off
883-
/usr/sbin/ovs-vlan-bug-workaround eth1 off
884879
/usr/bin/ovs-vsctl --timeout=20
885880
--if-exists del-br xenbr0
886881
--if-exists del-br xenbr1
@@ -967,10 +962,8 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi2 configuration
967962
Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration
968963
/sbin/ip link set eth0 up mtu 1500
969964
/sbin/ethtool -K eth0 gro off lro off
970-
/usr/sbin/ovs-vlan-bug-workaround eth0 on
971965
/sbin/ip link set eth1 up mtu 1500
972966
/sbin/ethtool -K eth1 gro off lro off
973-
/usr/sbin/ovs-vlan-bug-workaround eth1 off
974967
/usr/bin/ovs-vsctl --timeout=20
975968
--if-exists del-br xenbr0
976969
--if-exists del-br xenbr1

Diff for: ‎utilities/.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
/ovs-tcpdump.8
3232
/ovs-tcpundump
3333
/ovs-tcpundump.1
34-
/ovs-vlan-bug-workaround
35-
/ovs-vlan-bug-workaround.8
3634
/ovs-vlan-test
3735
/ovs-vlan-test.8
3836
/ovs-vsctl

Diff for: ‎utilities/automake.mk

-8
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ MAN_ROOTS += \
7676
utilities/ovs-pki.8.in \
7777
utilities/ovs-tcpdump.8.in \
7878
utilities/ovs-tcpundump.1.in \
79-
utilities/ovs-vlan-bug-workaround.8.in \
8079
utilities/ovs-vsctl.8.in
81-
MAN_FRAGMENTS += utilities/ovs-vlan-bugs.man
8280
CLEANFILES += \
8381
utilities/ovs-appctl.8 \
8482
utilities/ovs-ctl \
@@ -104,7 +102,6 @@ CLEANFILES += \
104102
utilities/ovs-tcpundump.1 \
105103
utilities/ovs-test \
106104
utilities/ovs-vlan-test \
107-
utilities/ovs-vlan-bug-workaround.8 \
108105
utilities/ovs-vsctl.8
109106

110107
man_MANS += \
@@ -121,7 +118,6 @@ man_MANS += \
121118
utilities/ovs-pki.8 \
122119
utilities/ovs-tcpdump.8 \
123120
utilities/ovs-tcpundump.1 \
124-
utilities/ovs-vlan-bug-workaround.8 \
125121
utilities/ovs-vsctl.8
126122

127123
utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
@@ -142,10 +138,6 @@ utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c
142138
utilities_ovs_vsctl_LDADD = lib/libopenvswitch.la
143139

144140
if LINUX
145-
sbin_PROGRAMS += utilities/ovs-vlan-bug-workaround
146-
utilities_ovs_vlan_bug_workaround_SOURCES = utilities/ovs-vlan-bug-workaround.c
147-
utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.la
148-
149141
noinst_PROGRAMS += utilities/nlmon
150142
utilities_nlmon_SOURCES = utilities/nlmon.c
151143
utilities_nlmon_LDADD = lib/libopenvswitch.la

Diff for: ‎utilities/ovs-vlan-bug-workaround.8.in

-86
This file was deleted.

0 commit comments

Comments
 (0)