diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-02 11:20:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-02 11:20:17 -0700 |
| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 (patch) | |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 /drivers/net/ethernet/aquantia/atlantic/aq_main.c | |
| parent | Merge branch 'net-dsa-mv88e6xxx-centralize-SERDES-IRQ-handling' (diff) | |
| parent | Linux 5.3-rc7 (diff) | |
| download | linux-dev-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.tar.xz linux-dev-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_main.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index 100722ad5c2d..b4a0fb281e69 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -61,6 +61,10 @@ static int aq_ndev_open(struct net_device *ndev) if (err < 0) goto err_exit; + err = aq_filters_vlans_update(aq_nic); + if (err < 0) + goto err_exit; + err = aq_nic_start(aq_nic); if (err < 0) goto err_exit; |