nfp: mark port state as stale if update failed
authorJakub Kicinski <jakub.kicinski@netronome.com>
Mon, 22 May 2017 17:59:33 +0000 (10:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 May 2017 18:59:06 +0000 (14:59 -0400)
If reading new state of the port failed, mark the port back as CHANGED.
This way next user state request will trigger refresh, which will
hopefully succeed.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/nfp_net_main.c

index 12cbf21df3b97c3ca175690663c90591d43290dc..dd1118c7e1a470dfcc8c70e896265c526b4d522d 100644 (file)
@@ -528,6 +528,7 @@ nfp_net_eth_port_update(struct nfp_cpp *cpp, struct nfp_port *port,
 
        eth_port = nfp_net_find_port(eth_table, port->eth_id);
        if (!eth_port) {
+               set_bit(NFP_PORT_CHANGED, &port->flags);
                nfp_warn(cpp, "Warning: port #%d not present after reconfig\n",
                         port->eth_id);
                return -EIO;
@@ -563,6 +564,9 @@ static void nfp_net_refresh_vnics(struct work_struct *work)
 
        eth_table = nfp_eth_read_ports(pf->cpp);
        if (!eth_table) {
+               list_for_each_entry(port, &pf->ports, port_list)
+                       if (__nfp_port_get_eth_port(port))
+                               set_bit(NFP_PORT_CHANGED, &port->flags);
                rtnl_unlock();
                nfp_err(pf->cpp, "Error refreshing port config!\n");
                goto out;
@@ -611,6 +615,7 @@ int nfp_net_refresh_eth_port(struct nfp_port *port)
 
        eth_table = nfp_eth_read_ports(cpp);
        if (!eth_table) {
+               set_bit(NFP_PORT_CHANGED, &port->flags);
                nfp_err(cpp, "Error refreshing port state table!\n");
                return -EIO;
        }