netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cpmac: use #ifdef CONFIG_NETDEVICES_MULTIQUEUE to wrap mq feature
@ 2008-06-19  3:20 Wang Chen
  0 siblings, 0 replies; only message in thread
From: Wang Chen @ 2008-06-19  3:20 UTC (permalink / raw)
  To: Jeff Garzik, NETDEV, Eugene Konev

netdev->features |= NETIF_F_MULTI_QUEUE should wrapped by
#ifdef CONFIG_NETDEVICES_MULTIQUEUE.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
---
 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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2008-06-19  3:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-19  3:20 [PATCH] cpmac: use #ifdef CONFIG_NETDEVICES_MULTIQUEUE to wrap mq feature Wang Chen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).