net/smc: determine vlan_id of stacked net_device

An SMC link group is bound to a specific vlan_id. Its link uses
the RoCE-GIDs established for the specific vlan_id. This patch makes
sure the appropriate vlan_id is determined for stacked scenarios like
for instance a master bonding device with vlan devices enslaved.

Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index d9247765aff328a9bfeb9038569dbe00a2304bad..1f3ea62fac5cc80f7288d7d9c94833a766bfe8c6 100644 (file)
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -360,7 +360,8 @@ void smc_lgr_terminate(struct smc_link_group *lgr)
 static int smc_vlan_by_tcpsk(struct socket *clcsock, unsigned short *vlan_id)
 {
        struct dst_entry *dst = sk_dst_get(clcsock->sk);
-       int rc = 0;
+       struct net_device *ndev;
+       int i, nest_lvl, rc = 0;
 
        *vlan_id = 0;
        if (!dst) {
@@ -372,8 +373,27 @@ static int smc_vlan_by_tcpsk(struct socket *clcsock, unsigned short *vlan_id)
                goto out_rel;
        }
 
-       if (is_vlan_dev(dst->dev))
-               *vlan_id = vlan_dev_vlan_id(dst->dev);
+       ndev = dst->dev;
+       if (is_vlan_dev(ndev)) {
+               *vlan_id = vlan_dev_vlan_id(ndev);
+               goto out_rel;
+       }
+
+       rtnl_lock();
+       nest_lvl = dev_get_nest_level(ndev);
+       for (i = 0; i < nest_lvl; i++) {
+               struct list_head *lower = &ndev->adj_list.lower;
+
+               if (list_empty(lower))
+                       break;
+               lower = lower->next;
+               ndev = (struct net_device *)netdev_lower_get_next(ndev, &lower);
+               if (is_vlan_dev(ndev)) {
+                       *vlan_id = vlan_dev_vlan_id(ndev);
+                       break;
+               }
+       }
+       rtnl_unlock();
 
 out_rel:
        dst_release(dst);