[PATCH] cpmac: use #ifdef CONFIG_NETDEVICES_MULTIQUEUE to wrap mq feature
From: Wang Chen <hidden>
Date: 2008-06-19 03:24:44
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
netdev->features |= NETIF_F_MULTI_QUEUE should wrapped by #ifdef CONFIG_NETDEVICES_MULTIQUEUE. Signed-off-by: Wang Chen <redacted> --- drivers/net/cpmac.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 7f3f62e..9172dec 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c@@ -1152,7 +1152,11 @@ static int __devinit cpmac_probe(struct platform_device *pdev) } } +#ifdef CONFIG_NETDEVICES_MULTIQUEUE dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES); +#else + dev = alloc_etherdev(sizeof(*priv)); +#endif if (!dev) { printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
@@ -1179,7 +1183,9 @@ static int __devinit cpmac_probe(struct platform_device *pdev) dev->set_multicast_list = cpmac_set_multicast_list; dev->tx_timeout = cpmac_tx_timeout; dev->ethtool_ops = &cpmac_ethtool_ops; +#ifdef CONFIG_NETDEVICES_MULTIQUEUE dev->features |= NETIF_F_MULTI_QUEUE; +#endif netif_napi_add(dev, &priv->napi, cpmac_poll, 64);
--
1.5.3.4