#include <linux/bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1680,6 +1681,17 @@ static void bgmac_mii_unregister(struct
+@@ -1681,6 +1682,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1825,6 +1837,14 @@ static int bgmac_probe(struct bcma_devic
+@@ -1829,6 +1841,14 @@ static int bgmac_probe(struct bcma_devic
net_dev->hw_features = net_dev->features;
net_dev->vlan_features = net_dev->features;
+
err = register_netdev(bgmac->net_dev);
if (err) {
- bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1851,6 +1871,10 @@ static void bgmac_remove(struct bcma_dev
+ dev_err(bgmac->dev, "Cannot register net device\n");
+@@ -1855,6 +1875,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);
netif_napi_del(&bgmac->napi);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -462,6 +462,9 @@ struct bgmac {
+@@ -454,6 +454,9 @@ struct bgmac {
bool has_robosw;
bool loopback;