Fix for Errno::EOPNOTSUPP when adding vlan with Ubuntu 10.04 (32 or 64 bit)

This commit is contained in:
Brian Candler
2011-05-08 11:50:04 +01:00
parent 57b011b4cf
commit aeed00a5d5
2 changed files with 1 additions and 5 deletions

View File

@@ -28,7 +28,7 @@ module Netlink
field :type, :ushort # ARPHRD_* field :type, :ushort # ARPHRD_*
field :index, :int field :index, :int
field :flags, :uint # IFF_* field :flags, :uint # IFF_*
field :change, :uint, :default=>0xffffffff # flags to change field :change, :uint # flags to change
rtattr :address, IFLA_ADDRESS, :l2addr rtattr :address, IFLA_ADDRESS, :l2addr
rtattr :broadcast, IFLA_BROADCAST, :l2addr rtattr :broadcast, IFLA_BROADCAST, :l2addr
rtattr :ifname, IFLA_IFNAME, :cstring rtattr :ifname, IFLA_IFNAME, :cstring

View File

@@ -72,10 +72,6 @@ class TestAddr < Test::Unit::TestCase
@ip.vlan.list(:link=>"lo").map { |x| x.linkinfo.data.id } @ip.vlan.list(:link=>"lo").map { |x| x.linkinfo.data.id }
end end
# FIXME: On 10.04.2 LTS (32 and 64 bit) this gives Errno::EOPNOTSUPP; but
# ip link add link lo type vlan id 1234
# ip link delete vlan0
# both work fine.
test "Add and remove vlan" do test "Add and remove vlan" do
begin begin
@ip.vlan.delete(:link=>"lo", :vlan_id=>1234) @ip.vlan.delete(:link=>"lo", :vlan_id=>1234)