From f3f5f1927f0d3aef9e3d2ce554dbfa0de73487d5 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 16 Sep 2013 14:18:37 -0600 Subject: tools/hotplug: set mtu from bridge for tap interface With changeset 22885 support was added for setting the MTU in the vif-bridge script for when a vif interface was set to 'online'. The was not done for the 'add' operation. The 'add' operation was added to the script for when tap devices were specified (c/s 21944). With the setting of the MTU for the 'online' case was there a reason for omitting the 'add'? This patch sets the MTU for both 'online' and 'add' in the vif-bridge script. Signed-off-by: Charles Arnold Acked-by: Ian Campbell --- tools/hotplug/Linux/vif-bridge | 7 ++----- tools/hotplug/Linux/xen-network-common.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index 9a6f82a716..678262d004 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -81,11 +81,7 @@ fi case "$command" in online) setup_virtual_bridge_port "$dev" - mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set $dev mtu $mtu || : - fi + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; @@ -96,6 +92,7 @@ case "$command" in add) setup_virtual_bridge_port "$dev" + set_mtu $bridge $dev add_to_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8cff156d29..50b8711cca 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -132,3 +132,13 @@ add_to_bridge () { ip link set ${dev} up } +# Usage: set_mtu bridge dev +set_mtu () { + local bridge=$1 + local dev=$2 + mtu="`ip link show ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set ${dev} mtu $mtu || : + fi +} -- cgit v1.2.3