nfp: prepare config and enable for working without netdevs
authorJakub Kicinski <jakub.kicinski@netronome.com>
Tue, 6 Jun 2017 00:01:49 +0000 (17:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jun 2017 16:51:39 +0000 (12:51 -0400)
Out of the three stages of ifup/ifdown (allocate, configure, start)
- this commit prepares the configuration stage for working with
control vNICs.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/nfp_net_common.c

index 1cc7425..c477058 100644 (file)
@@ -2236,9 +2236,10 @@ static int nfp_net_set_config_and_enable(struct nfp_net *nn)
        nn_writeq(nn, NFP_NET_CFG_RXRS_ENABLE, nn->dp.num_rx_rings == 64 ?
                  0xffffffffffffffffULL : ((u64)1 << nn->dp.num_rx_rings) - 1);
 
-       nfp_net_write_mac_addr(nn, nn->dp.netdev->dev_addr);
+       if (nn->dp.netdev)
+               nfp_net_write_mac_addr(nn, nn->dp.netdev->dev_addr);
 
-       nn_writel(nn, NFP_NET_CFG_MTU, nn->dp.netdev->mtu);
+       nn_writel(nn, NFP_NET_CFG_MTU, nn->dp.mtu);
 
        bufsz = nn->dp.fl_bufsz - nn->dp.rx_dma_off - NFP_NET_RX_BUF_NON_DATA;
        nn_writel(nn, NFP_NET_CFG_FLBUFSZ, bufsz);