forked from luck/tmp_suning_uos_patched
gianfar: Fix compile regression caused by bea3348e
Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
25b31cb118
commit
94e8cc35bc
@ -261,7 +261,9 @@ static int gfar_probe(struct platform_device *pdev)
|
|||||||
dev->hard_start_xmit = gfar_start_xmit;
|
dev->hard_start_xmit = gfar_start_xmit;
|
||||||
dev->tx_timeout = gfar_timeout;
|
dev->tx_timeout = gfar_timeout;
|
||||||
dev->watchdog_timeo = TX_TIMEOUT;
|
dev->watchdog_timeo = TX_TIMEOUT;
|
||||||
|
#ifdef CONFIG_GFAR_NAPI
|
||||||
netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
|
netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||||
dev->poll_controller = gfar_netpoll;
|
dev->poll_controller = gfar_netpoll;
|
||||||
#endif
|
#endif
|
||||||
@ -931,6 +933,7 @@ int startup_gfar(struct net_device *dev)
|
|||||||
/* Returns 0 for success. */
|
/* Returns 0 for success. */
|
||||||
static int gfar_enet_open(struct net_device *dev)
|
static int gfar_enet_open(struct net_device *dev)
|
||||||
{
|
{
|
||||||
|
struct gfar_private *priv = netdev_priv(dev);
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
napi_enable(&priv->napi);
|
napi_enable(&priv->napi);
|
||||||
|
Loading…
Reference in New Issue
Block a user