Skip to content

Commit

Permalink
Merge branch 'bgmac'
Browse files Browse the repository at this point in the history
Hauke Mehrtens says:

====================
bgmac: some fixes to napi usage

I compared the napi documentation with the bgmac driver and found some
problems in that driver. These two patches should fix the problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 19, 2015
2 parents 852c5d9 + 43f159c commit e60bf80
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/net/ethernet/broadcom/bgmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
bgmac->int_status = 0;
}

if (handled < weight)
if (handled < weight) {
napi_complete(napi);

bgmac_chip_intrs_on(bgmac);
bgmac_chip_intrs_on(bgmac);
}

return handled;
}
Expand Down Expand Up @@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_device *core)
if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");

netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);

err = bgmac_mii_register(bgmac);
if (err) {
bgmac_err(bgmac, "Cannot register MDIO\n");
Expand All @@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_device *core)

netif_carrier_off(net_dev);

netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);

return 0;

err_mii_unregister:
Expand All @@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_device *core)
{
struct bgmac *bgmac = bcma_get_drvdata(core);

netif_napi_del(&bgmac->napi);
unregister_netdev(bgmac->net_dev);
bgmac_mii_unregister(bgmac);
netif_napi_del(&bgmac->napi);
bgmac_dma_free(bgmac);
bcma_set_drvdata(core, NULL);
free_netdev(bgmac->net_dev);
Expand Down

0 comments on commit e60bf80

Please sign in to comment.