|
 |
afa7aa1 |
From bada26263c36a8be07aece7e9f4986ee31e4d97f Mon Sep 17 00:00:00 2001
|
|
|
afa7aa1 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
|
afa7aa1 |
Date: Mon, 9 Oct 2017 11:47:08 +0200
|
|
|
afa7aa1 |
Subject: [PATCH] Merge pull request #287 from xlpang/master
|
|
|
afa7aa1 |
|
|
|
afa7aa1 |
fcoe: handle CNAs with DCB firmware support
|
|
|
afa7aa1 |
---
|
|
|
afa7aa1 |
modules.d/95fcoe/module-setup.sh | 26 ++++++++++++++++++++------
|
|
|
afa7aa1 |
1 file changed, 20 insertions(+), 6 deletions(-)
|
|
|
afa7aa1 |
|
|
|
afa7aa1 |
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
|
|
afa7aa1 |
index e14a0ebb..eabb21c7 100755
|
|
|
afa7aa1 |
--- a/modules.d/95fcoe/module-setup.sh
|
|
|
afa7aa1 |
+++ b/modules.d/95fcoe/module-setup.sh
|
|
|
afa7aa1 |
@@ -51,16 +51,30 @@ cmdline() {
|
|
|
afa7aa1 |
read mac < ${i}/address
|
|
|
afa7aa1 |
s=$(dcbtool gc ${i##*/} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
|
afa7aa1 |
if [ -z "$s" ] ; then
|
|
|
afa7aa1 |
- p=$(get_vlan_parent ${i})
|
|
|
afa7aa1 |
- if [ "$p" ] ; then
|
|
|
afa7aa1 |
- s=$(dcbtool gc ${p} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
|
afa7aa1 |
- fi
|
|
|
afa7aa1 |
+ p=$(get_vlan_parent ${i})
|
|
|
afa7aa1 |
+ if [ "$p" ] ; then
|
|
|
afa7aa1 |
+ s=$(dcbtool gc ${p} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
|
afa7aa1 |
+ fi
|
|
|
afa7aa1 |
fi
|
|
|
afa7aa1 |
if [ "$s" = "on" ] ; then
|
|
|
afa7aa1 |
- dcb="dcb"
|
|
|
afa7aa1 |
+ dcb="dcb"
|
|
|
afa7aa1 |
else
|
|
|
afa7aa1 |
- dcb="nodcb"
|
|
|
afa7aa1 |
+ dcb="nodcb"
|
|
|
afa7aa1 |
fi
|
|
|
afa7aa1 |
+
|
|
|
afa7aa1 |
+ # Some Combined Network Adapters(CNAs) implement DCB in firmware.
|
|
|
afa7aa1 |
+ # Do not run software-based DCB or LLDP on CNAs that implement DCB.
|
|
|
afa7aa1 |
+ # If the network interface provides hardware DCB/DCBX capabilities,
|
|
|
afa7aa1 |
+ # DCB_REQUIRED in "/etc/fcoe/cfg-xxx" is expected to set to "no".
|
|
|
afa7aa1 |
+ #
|
|
|
afa7aa1 |
+ # Force "nodcb" if there's any DCB_REQUIRED="no"(child or vlan parent).
|
|
|
afa7aa1 |
+ grep -q "^[[:blank:]]*DCB_REQUIRED=\"no\"" /etc/fcoe/cfg-${i##*/} &>/dev/null
|
|
|
afa7aa1 |
+ [ $? -eq 0 ] && dcb="nodcb"
|
|
|
afa7aa1 |
+ if [ "$p" ] ; then
|
|
|
afa7aa1 |
+ grep -q "^[[:blank:]]*DCB_REQUIRED=\"no\"" /etc/fcoe/cfg-${p} &>/dev/null
|
|
|
afa7aa1 |
+ [ $? -eq 0 ] && dcb="nodcb"
|
|
|
afa7aa1 |
+ fi
|
|
|
afa7aa1 |
+
|
|
|
afa7aa1 |
echo "fcoe=${mac}:${dcb}"
|
|
|
afa7aa1 |
done
|
|
|
afa7aa1 |
}
|
|
|
afa7aa1 |
|