Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e60bf806 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bgmac' 



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: default avatarDavid S. Miller <davem@davemloft.net>
parents 852c5d9c 43f159c6

drivers/net/ethernet/broadcom/bgmac.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

	}



	return handled;

}
@@ -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");
@@ -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:
@@ -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);