Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e3dbc46c2a62688d1aaa1f7291a054fb2b502849

Authored by Choi, Jong-Hwan
Committed by David S. Miller
1 parent ebbf9295b1
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

include/linux/netdevice.h
Diff comments   View file @ e3dbc46
... ... @@ -530,7 +530,7 @@
530 530 struct Qdisc *qdisc;
531 531 unsigned long state;
532 532 struct Qdisc *qdisc_sleeping;
533   -#ifdef CONFIG_RPS
  533 +#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
534 534 struct kobject kobj;
535 535 #endif
536 536 #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
... ... @@ -1179,7 +1179,7 @@
1179 1179  
1180 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 1183 struct kset *queues_kset;
1184 1184  
1185 1185 struct netdev_rx_queue *_rx;