|
 |
e343c9 |
From 94f12a1f78b86ff0c597c29c91d020732ce68df3 Mon Sep 17 00:00:00 2001
|
|
|
e343c9 |
From: Vasu Dev <vasu.dev@intel.com>
|
|
|
e343c9 |
Date: Fri, 30 Jan 2015 14:29:19 -0800
|
|
|
e343c9 |
Subject: [PATCH] fipvlan: fix broken fcoe start using fipvlan
|
|
|
e343c9 |
|
|
|
e343c9 |
FCoE start is broken due to the link being never selected and that
|
|
|
e343c9 |
is in turn due to bad vlan interface name compare against real
|
|
|
e343c9 |
interface name passed for fip vlan discovery.
|
|
|
e343c9 |
|
|
|
e343c9 |
This name compare is unnecessary and breaks fipvlan start option,
|
|
|
e343c9 |
so this patch removes it to have fcoe start working again.
|
|
|
e343c9 |
|
|
|
e343c9 |
I considered reducing compare to just the base real interface name
|
|
|
e343c9 |
but that won't work in the case of existing vlan interface name is
|
|
|
e343c9 |
already customized, so instead just don't check for the name.
|
|
|
e343c9 |
|
|
|
e343c9 |
I verified this fixes the start using newly created vlan as well
|
|
|
e343c9 |
as existing vlan, which could be down or already running.
|
|
|
e343c9 |
|
|
|
e343c9 |
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
|
|
|
e343c9 |
---
|
|
|
e343c9 |
fipvlan.c | 13 -------------
|
|
|
e343c9 |
1 file changed, 13 deletions(-)
|
|
|
e343c9 |
|
|
|
e343c9 |
diff --git a/fipvlan.c b/fipvlan.c
|
|
|
e343c9 |
index 4937173..9e494ee 100644
|
|
|
e343c9 |
--- a/fipvlan.c
|
|
|
e343c9 |
+++ b/fipvlan.c
|
|
|
e343c9 |
@@ -448,19 +448,6 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh)
|
|
|
e343c9 |
memcpy(iff->mac_addr, RTA_DATA(ifla[IFLA_ADDRESS]), ETHER_ADDR_LEN);
|
|
|
e343c9 |
strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ);
|
|
|
e343c9 |
|
|
|
e343c9 |
- if (!config.automode) {
|
|
|
e343c9 |
- int i, iff_selected = 0;
|
|
|
e343c9 |
-
|
|
|
e343c9 |
- for (i = 0; i < config.namec; i++) {
|
|
|
e343c9 |
- if (!strcmp(iff->ifname, config.namev[i]))
|
|
|
e343c9 |
- iff_selected = 1;
|
|
|
e343c9 |
- }
|
|
|
e343c9 |
- if (!iff_selected) {
|
|
|
e343c9 |
- FIP_LOG_DBG("ignoring if %s\n", iff->ifname);
|
|
|
e343c9 |
- free(iff);
|
|
|
e343c9 |
- return;
|
|
|
e343c9 |
- }
|
|
|
e343c9 |
- }
|
|
|
e343c9 |
if (ifla[IFLA_LINKINFO]) {
|
|
|
e343c9 |
parse_linkinfo(linkinfo, ifla[IFLA_LINKINFO]);
|
|
|
e343c9 |
/* Track VLAN devices separately */
|
|
|
e343c9 |
--
|
|
|
e343c9 |
2.1.0
|
|
|
e343c9 |
|