[Open-FCoE] [PATCH] fipvlan: allow FIP VLAN Request to be sent on a given VLAN interface

[Yi Zou]

fipvlan current does not allow VLAN Request on an existing VLAN interfaces,
which is perfectly ok from the spec's perspective. This fixes it by just
populating the given VLAN interface into the interface list.

Signed-off-by: Yi Zou <yi....@intel.com>
Tested-by: Ross Brattain <ross.b.bratt...@intel.com>
---

 fipvlan.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fipvlan.c b/fipvlan.c
index 35dcb53..581c8b2 100644
--- a/fipvlan.c
+++ b/fipvlan.c
@@ -163,14 +163,21 @@ struct fcf *lookup_fcf(int ifindex, uint16_t vlan, 
unsigned char *mac)
 struct iff *lookup_iff(int ifindex, char *ifname)
 {
        struct iff *iff;
+       struct iff *vlan;
 
        if (!ifindex && !ifname)
                return NULL;
 
-       TAILQ_FOREACH(iff, &interfaces, list_node)
+       TAILQ_FOREACH(iff, &interfaces, list_node) {
                if ((!ifindex || ifindex == iff->ifindex) &&
                    (!ifname  || strcmp(ifname, iff->ifname) == 0))
                        return iff;
+
+               TAILQ_FOREACH(vlan, &iff->vlans, list_node)
+                       if ((!ifindex || ifindex == vlan->ifindex) &&
+                           (!ifname  || strcmp(ifname, vlan->ifname) == 0))
+                               return vlan;
+       }
        return NULL;
 }
 
@@ -389,7 +396,7 @@ void rtnl_recv_newlink(struct nlmsghdr *nh)
                                return;
                        }
                        TAILQ_INSERT_TAIL(&real_dev->vlans, iff, list_node);
-                       return;
+                       goto add_vlan;
                }
                /* ignore bonding interfaces */
                if (linkinfo[IFLA_INFO_KIND] &&
@@ -398,12 +405,13 @@ void rtnl_recv_newlink(struct nlmsghdr *nh)
                        return;
                }
        }
+       TAILQ_INSERT_TAIL(&interfaces, iff, list_node);
+add_vlan:
        iff->ps = fip_socket(iff->ifindex);
        setsockopt(iff->ps, SOL_PACKET, PACKET_ORIGDEV,
                   &origdev, sizeof(origdev));
        if (iff->running)
                pfd_add(iff->ps);
-       TAILQ_INSERT_TAIL(&interfaces, iff, list_node);
 }
 
 /* command line arguments */

_______________________________________________
devel mailing list
devel@open-fcoe.org
https://lists.open-fcoe.org/mailman/listinfo/devel