projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25b31cb
)
gianfar: Fix compile regression caused by bea3348e
author
Li Yang
<leoli@freescale.com>
Fri, 12 Oct 2007 13:53:51 +0000
(21:53 +0800)
committer
Jeff Garzik
<jeff@garzik.org>
Mon, 15 Oct 2007 18:41:34 +0000
(14:41 -0400)
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/gianfar.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/gianfar.c
b/drivers/net/gianfar.c
index 0db5e6fabe73146ddc1f29e4e3b220f3ce4fcfec..2b758fa334d39a048d27a5f5cd0ca12e5b116abd 100644
(file)
--- a/
drivers/net/gianfar.c
+++ b/
drivers/net/gianfar.c
@@
-261,7
+261,9
@@
static int gfar_probe(struct platform_device *pdev)
dev->hard_start_xmit = gfar_start_xmit;
dev->tx_timeout = gfar_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
+#ifdef CONFIG_GFAR_NAPI
netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
+#endif
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = gfar_netpoll;
#endif
@@
-931,6
+933,7
@@
tx_skb_fail:
/* Returns 0 for success. */
static int gfar_enet_open(struct net_device *dev)
{
+ struct gfar_private *priv = netdev_priv(dev);
int err;
napi_enable(&priv->napi);