diff options
Diffstat (limited to 'drivers/net/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index a6f49d025787..4e6a9195fe5f 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -209,7 +209,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget) | |||
209 | 209 | ||
210 | if (received < budget) { | 210 | if (received < budget) { |
211 | /* done */ | 211 | /* done */ |
212 | netif_rx_complete(dev, napi); | 212 | netif_rx_complete(napi); |
213 | (*fep->ops->napi_enable_rx)(dev); | 213 | (*fep->ops->napi_enable_rx)(dev); |
214 | } | 214 | } |
215 | return received; | 215 | return received; |
@@ -478,7 +478,7 @@ fs_enet_interrupt(int irq, void *dev_id) | |||
478 | /* NOTE: it is possible for FCCs in NAPI mode */ | 478 | /* NOTE: it is possible for FCCs in NAPI mode */ |
479 | /* to submit a spurious interrupt while in poll */ | 479 | /* to submit a spurious interrupt while in poll */ |
480 | if (napi_ok) | 480 | if (napi_ok) |
481 | __netif_rx_schedule(dev, &fep->napi); | 481 | __netif_rx_schedule(&fep->napi); |
482 | } | 482 | } |
483 | } | 483 | } |
484 | 484 | ||
@@ -1117,10 +1117,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev, | |||
1117 | if (ret) | 1117 | if (ret) |
1118 | goto out_free_bd; | 1118 | goto out_free_bd; |
1119 | 1119 | ||
1120 | printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n", | 1120 | printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr); |
1121 | ndev->name, | ||
1122 | ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], | ||
1123 | ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); | ||
1124 | 1121 | ||
1125 | return 0; | 1122 | return 0; |
1126 | 1123 | ||