X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopt_xensource_libexec_InterfaceReconfigureBridge.py;h=a93e438667debc347d9248b4969b305db6e25a21;hb=c1a543a8d6d2847983b6b0defd1e19777da85715;hp=8803122d8a7ec86dfe46764ac9b14e14c7f74032;hpb=2776e4086038071f25e67579fc4215ef95ea26a6;p=sliver-openvswitch.git diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py index 8803122d8..a93e43866 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py @@ -274,7 +274,8 @@ def _configure_physical_interface(pif): f.write("TYPE=Ethernet\n") f.write("HWADDR=%(MAC)s\n" % pifrec) - settings,offload = ethtool_settings(pifrec['other_config']) + settings,offload = ethtool_settings(pifrec['other_config'], + PIF_OTHERCONFIG_DEFAULTS) if len(settings): f.write("ETHTOOL_OPTS=\"%s\"\n" % str.join(" ", settings)) if len(offload): @@ -338,7 +339,7 @@ def _configure_bond_interface(pif): if len(offload): f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload)) - mtu = mtu_setting(pifrec['network'], "VLAN-PIF", pifrec['other_config']) + mtu = mtu_setting(pifrec['network'], "Bond-PIF", pifrec['other_config']) if mtu: f.write("MTU=%s\n" % mtu) @@ -389,7 +390,7 @@ def _configure_vlan_interface(pif): if len(offload): f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload)) - mtu = mtu_setting(pifrec['network'], "Bond-PIF", pifrec['other_config']) + mtu = mtu_setting(pifrec['network'], "VLAN-PIF", pifrec['other_config']) if mtu: f.write("MTU=%s\n" % mtu)