diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-28 03:31:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-28 03:31:39 +0100 |
| commit | 9f6e055907362f6692185c1c9658295d24095c74 (patch) | |
| tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f /drivers/net/hyperv | |
| parent | mlxsw: reg: Update module_type values in PMTM register and map them to width (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-9f6e055907362f6692185c1c9658295d24095c74.tar.xz linux-9f6e055907362f6692185c1c9658295d24095c74.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.
The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 2 | ||||
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index ae3f3084c2ed..1b320bcf150a 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -99,7 +99,7 @@ static struct netvsc_device *alloc_net_device(void) init_waitqueue_head(&net_device->wait_drain); net_device->destroy = false; - net_device->tx_disable = false; + net_device->tx_disable = true; net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT; net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT; diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 5ee282b20ecb..245ce2374035 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1065,6 +1065,7 @@ static int netvsc_attach(struct net_device *ndev, } /* In any case device is now ready */ + nvdev->tx_disable = false; netif_device_attach(ndev); /* Note: enable and attach happen when sub-channels setup */ @@ -2473,6 +2474,8 @@ static int netvsc_probe(struct hv_device *dev, else net->max_mtu = ETH_DATA_LEN; + nvdev->tx_disable = false; + ret = register_netdevice(net); if (ret != 0) { pr_err("Unable to register netdev.\n"); |