Skip to contentSkip to conversation

ifup.sh: Add support for bridge over team and vlan tagged team

PATCH Applied WANG Chao 3 participants 5 messages Apr 1, 2013 – Apr 9, 2013 1 message not in the archive

lore
Share & tools
lore

WANG Chao

author
#0 lore raw

PATCH 1/1 ifup.sh: Add support for bridge over team and vlan tagged team

Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too.

---
 modules.d/40network/ifup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
modules.d/40network/ifup.sh +8 -0
index 582278f..815ab64 100755
@@ -46,6 +46,8 @@ if [ -e /tmp/bridge.info ]; then
         if [ "$netif" = "$ethname" ]; then
             if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
                 : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
             else
                 netif="$bridgename"
                 use_bridge='true'
@@ -59,6 +61,8 @@ if [ -e /tmp/vlan.info ]; then
     if [ "$netif" = "$phydevice" ]; then
         if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
             : # We need to really setup bond (recursive call)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
         else
             netif="$vlanname"
             use_vlan='true'
@@ -212,6 +216,8 @@ if [ -e /tmp/bridge.info ]; then
         for ethname in $ethnames ; do
             if [ "$ethname" = "$bondname" ] ; then
                 DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
             else
                 linkup $ethname
             fi
@@ -235,6 +241,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
     modprobe 8021q
     if [ "$phydevice" = "$bondname" ] ; then
         DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
     else
         linkup "$phydevice"
     fi
Signature · 1 line
1.8.2

A message that is not in the archive (sent off-list or not yet received): 1364819680-1618-1-git-send-email-chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

author
#2 lore raw
Quoted 41 lines · WANG Chao

Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too.

---
 modules.d/40network/ifup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
modules.d/40network/ifup.sh +6 -0
index 582278f..815ab64 100755
@@ -46,6 +46,8 @@ if [ -e /tmp/bridge.info ]; then
         if [ "$netif" = "$ethname" ]; then
             if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
                 : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
             else
                 netif="$bridgename"
                 use_bridge='true'
@@ -59,6 +61,8 @@ if [ -e /tmp/vlan.info ]; then
     if [ "$netif" = "$phydevice" ]; then
         if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
             : # We need to really setup bond (recursive call)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
         else
             netif="$vlanname"
             use_vlan='true'
@@ -212,6 +216,8 @@ if [ -e /tmp/bridge.info ]; then
         for ethname in $ethnames ; do
             if [ "$ethname" = "$bondname" ] ; then
                 DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
             else
                 linkup $ethname
             fi

modules.d/40network/ifup.sh if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then · line 248

Quoted 8 lines
modules.d/40network/ifup.sh +2 -0
@@ -235,6 +241,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
     modprobe 8021q
     if [ "$phydevice" = "$bondname" ] ; then
         DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
     else
         linkup "$phydevice"
     fi

Hi, Harald

Team is one of the supported network devices in our kdump. And bridge over team and vlan tagged team is also required, while dracut is now lack of this ability. I tested this patch myself and it really solves the problem.

Can you or anyone else help to review this patch?

(Actually, I've also got another patch to support bridge a vlan tagged interface upon this one. I'll send that to ML once this patch is merged)

Thanks for your time.

WANG Chao

#3 lore raw
In reply to a message not in the archive
Quoted 3 lines · WANG Chao

Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too.

Looks good to me.

Next time please mention how you test the patch in the changelog, it helps too.

author
#4 lore raw
Quoted 9 lines · Cong Wang
Quoted 3 lines · WANG Chao

Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too.

Looks good to me.

Next time please mention how you test the patch in the changelog, it helps too.

Thanks for review.

I thought this patch is quite straightforward so I didn't mention the tests. I'll bring it up next time. Thanks!

WANG Chao

Applied
#5 lore raw
In reply to a message not in the archive

Am 01.04.2013 14:34, schrieb WANG Chao:

Quoted 41 lines

Team is the same network stack as bonding. Therefore give ifup the ability to handle bridge over team and vlan tagged team as bonding too.

---
 modules.d/40network/ifup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
modules.d/40network/ifup.sh +6 -0
index 582278f..815ab64 100755
@@ -46,6 +46,8 @@ if [ -e /tmp/bridge.info ]; then
         if [ "$netif" = "$ethname" ]; then
             if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
                 : # We need to really setup bond (recursive call)
+            elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+                : # We need to really setup team (recursive call)
             else
                 netif="$bridgename"
                 use_bridge='true'
@@ -59,6 +61,8 @@ if [ -e /tmp/vlan.info ]; then
     if [ "$netif" = "$phydevice" ]; then
         if [ "$netif" = "$bondname" ] && [ -n "$DO_BOND_SETUP" ] ; then
             : # We need to really setup bond (recursive call)
+        elif [ "$netif" = "$teammaster" ] && [ -n "$DO_TEAM_SETUP" ] ; then
+            : # We need to really setup team (recursive call)
         else
             netif="$vlanname"
             use_vlan='true'
@@ -212,6 +216,8 @@ if [ -e /tmp/bridge.info ]; then
         for ethname in $ethnames ; do
             if [ "$ethname" = "$bondname" ] ; then
                 DO_BOND_SETUP=yes ifup $bondname -m
+            elif [ "$ethname" = "$teammaster" ] ; then
+                DO_TEAM_SETUP=yes ifup $teammaster -m
             else
                 linkup $ethname
             fi

modules.d/40network/ifup.sh if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then · line 248

Quoted 8 lines
modules.d/40network/ifup.sh +2 -0
@@ -235,6 +241,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
     modprobe 8021q
     if [ "$phydevice" = "$bondname" ] ; then
         DO_BOND_SETUP=yes ifup $phydevice -m
+    elif [ "$phydevice" = "$teammaster" ] ; then
+        DO_TEAM_SETUP=yes ifup $phydevice -m
     else
         linkup "$phydevice"
     fi

applied