diff options
author | Choi, Jong-Hwan <jhbird.choi@samsung.com> | 2011-07-20 16:33:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 23:39:47 -0400 |
commit | e3dbc46c2a62688d1aaa1f7291a054fb2b502849 (patch) | |
tree | adae15d02aeba9c3f2430702a4161be01c4046b5 /include/linux/netdevice.h | |
parent | ebbf9295b17ed605f31f45d9269adb216be3a181 (diff) |
net: Kobj and queues_kset should be used when CONFIG_XPS is enabled
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>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 44f96b24e869..34f3abc6457a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -530,7 +530,7 @@ struct netdev_queue { | |||
530 | struct Qdisc *qdisc; | 530 | struct Qdisc *qdisc; |
531 | unsigned long state; | 531 | unsigned long state; |
532 | struct Qdisc *qdisc_sleeping; | 532 | struct Qdisc *qdisc_sleeping; |
533 | #ifdef CONFIG_RPS | 533 | #if defined(CONFIG_RPS) || defined(CONFIG_XPS) |
534 | struct kobject kobj; | 534 | struct kobject kobj; |
535 | #endif | 535 | #endif |
536 | #if defined(CONFIG_XPS) && defined(CONFIG_NUMA) | 536 | #if defined(CONFIG_XPS) && defined(CONFIG_NUMA) |
@@ -1179,7 +1179,7 @@ struct net_device { | |||
1179 | 1179 | ||
1180 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ | 1180 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ |
1181 | 1181 | ||
1182 | #ifdef CONFIG_RPS | 1182 | #if defined(CONFIG_RPS) || defined(CONFIG_XPS) |
1183 | struct kset *queues_kset; | 1183 | struct kset *queues_kset; |
1184 | 1184 | ||
1185 | struct netdev_rx_queue *_rx; | 1185 | struct netdev_rx_queue *_rx; |