This is a modified patch as per Robert Love's comments - https://lists.open-fcoe.org/pipermail/devel/2011-March/011272.html
After trying vlan discovery 10 times fcoemon disables auto_vlan on the port and falls back to the physical interface. bnx2fc does not support this. This patch checks for FCOE_ENABLE and AUTO_VLAN and if both are set for the interface, the vlan discovery will continue until a vlan is discovered. Signed-off-by: Nithin Nayak Sujir <[email protected]> --- fcoemon.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fcoemon.c b/fcoemon.c index e8795fd..97ea18f 100644 --- a/fcoemon.c +++ b/fcoemon.c @@ -2001,7 +2001,9 @@ void fcm_vlan_disc_timeout(void *arg) struct fcoe_port *p = arg; FCM_LOG_DBG("%s: VLAN discovery TIMEOUT [%d]", p->ifname, p->vlan_disc_count); - if (++(p->vlan_disc_count) > FCM_VLAN_DISC_MAX) { + p->vlan_disc_count++; + if (!(p->fcoe_enable && p->auto_vlan) && + (p->vlan_disc_count > FCM_VLAN_DISC_MAX)) { FCM_LOG("%s: VLAN discovery failed after %d attempts", p->ifname, FCM_VLAN_DISC_MAX); FCM_LOG("%s: disabling VLAN discovery, trying FCoE on %s", -- 1.7.1 _______________________________________________ devel mailing list [email protected] https://lists.open-fcoe.org/mailman/listinfo/devel
