net: Kobj and queues_kset should be used when CONFIG_XPS is enabled
authorChoi, Jong-Hwan <jhbird.choi@samsung.com>
Wed, 20 Jul 2011 20:33:03 +0000 (20:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 03:39:47 +0000 (20:39 -0700)
Kobj and queues_kset are used with CONFIG_XPS=y.

Signed-off-by: Choi, Jong-Hwan <jhbird.choi@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h

index 44f96b24e869a1d375269d14f51590f79c581980..34f3abc6457a73cd3044a9435962ead55d99d2d4 100644 (file)
@@ -530,7 +530,7 @@ struct netdev_queue {
        struct Qdisc            *qdisc;
        unsigned long           state;
        struct Qdisc            *qdisc_sleeping;
-#ifdef CONFIG_RPS
+#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
        struct kobject          kobj;
 #endif
 #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
@@ -1179,7 +1179,7 @@ struct net_device {
 
        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
 
-#ifdef CONFIG_RPS
+#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
        struct kset             *queues_kset;
 
        struct netdev_rx_queue  *_rx;