diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-10 12:28:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-10 12:28:27 +0300 |
| commit | 6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9 (patch) | |
| tree | f8e52ed2acd6316d0832f084b4c633f1d19079aa /drivers/net/ethernet/qualcomm/qca_spi.c | |
| parent | 29b75eb2d56a714190a93d7be4525e617591077a (diff) | |
| parent | 8e0f93cda48ed054e1216bab5c60017e1a5fc1e8 (diff) | |
| download | linux-6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9.tar.xz | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/qca_spi.c')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/qca_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 689a4a5c8dcf..1ef03939d25f 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -811,7 +811,7 @@ qcaspi_netdev_setup(struct net_device *dev) dev->netdev_ops = &qcaspi_netdev_ops; qcaspi_set_ethtool_ops(dev); dev->watchdog_timeo = QCASPI_TX_TIMEOUT; - dev->flags = IFF_MULTICAST; + dev->priv_flags &= ~IFF_TX_SKB_SHARING; dev->tx_queue_len = 100; qca = netdev_priv(dev); |