From: Paul Durrant <paul@xen.org>
To: xen-devel@lists.xenproject.org
Cc: Paul Durrant <pdurrant@amazon.com>,
Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wl@xen.org>
Subject: [PATCH v3 2/8] tools/hotplug/Linux: re-factor add_to_bridge() in xen-network-common.sh
Date: Tue, 11 Aug 2020 09:01:56 +0100 [thread overview]
Message-ID: <20200811080202.31163-3-paul@xen.org> (raw)
In-Reply-To: <20200811080202.31163-1-paul@xen.org>
From: Paul Durrant <pdurrant@amazon.com>
Remove duplication of 'ip link set dev'. It is perfectly fine to call it
even if the device has already been added to the bridge.
NOTE: This patch also adds code to write a debug log entry if the device
was already on the bridge.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
v3:
- Re-factored from "tools/hotplug: add remove_from_bridge() and improve
debug output" in v2
---
tools/hotplug/Linux/xen-network-common.sh | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh
index 8dd3a62068..ec3bd4ec4a 100644
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -126,16 +126,18 @@ add_to_bridge () {
local bridge=$1
local dev=$2
- # Don't add $dev to $bridge if it's already on a bridge.
- if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
- ip link set dev ${dev} up || true
- return
- fi
- if which brctl >&/dev/null; then
- brctl addif ${bridge} ${dev}
+ # Don't add $dev to $bridge if it's already on the bridge.
+ if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
+ log debug "adding $dev to bridge $bridge"
+ if which brctl >&/dev/null; then
+ brctl addif ${bridge} ${dev}
+ else
+ ip link set ${dev} master ${bridge}
+ fi
else
- ip link set ${dev} master ${bridge}
+ log debug "$dev already on bridge $bridge"
fi
+
ip link set dev ${dev} up
}
--
2.20.1
next prev parent reply other threads:[~2020-08-11 8:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 8:01 [PATCH v3 0/8] tools: propogate MTU to vif frontends Paul Durrant
2020-08-11 8:01 ` [PATCH v3 1/8] public/io/netif: specify MTU override node Paul Durrant
2020-08-14 16:24 ` Wei Liu
2020-08-11 8:01 ` Paul Durrant [this message]
2020-08-11 8:01 ` [PATCH v3 3/8] tools/hotplug/Linux: add remove_from_bridge() Paul Durrant
2020-08-11 8:01 ` [PATCH v3 4/8] tools/hotplug/Linux: remove code duplication in vif-bridge Paul Durrant
2020-08-11 8:01 ` [PATCH v3 5/8] libxl: wire the libxl_device_nic 'mtu' value into xenstore Paul Durrant
2020-08-11 8:02 ` [PATCH v3 6/8] tools/hotplug/Linux: modify set_mtu() to optionally use a configured value Paul Durrant
2020-08-11 8:02 ` [PATCH v3 7/8] xl: add 'mtu' option to network configuration Paul Durrant
2020-08-11 8:02 ` [PATCH v3 8/8] remove netchannel2 hotplug script... ancient history Paul Durrant
2020-08-27 9:58 ` [PATCH v3 0/8] tools: propogate MTU to vif frontends Wei Liu
2020-08-28 11:03 ` Durrant, Paul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200811080202.31163-3-paul@xen.org \
--to=paul@xen.org \
--cc=ian.jackson@eu.citrix.com \
--cc=pdurrant@amazon.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).