| Message ID | 151553775426.22654.5680031281102493621.stgit@firesoul |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: fix xdp_rxq_info build issue when CONFIG_SYSFS is not set | expand |
On Tue, Jan 09, 2018 at 11:42:34PM +0100, Jesper Dangaard Brouer wrote: > The commit e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") > removed some ifdef CONFIG_SYSFS in net/core/dev.c, but forgot to > remove the corresponding ifdef's in include/linux/netdevice.h. > > Fixes: e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") > Reported-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Guenter Roeck <linux@roeck-us.net> > --- > include/linux/netdevice.h | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h > index 440b000f07f4..b308793c64ce 100644 > --- a/include/linux/netdevice.h > +++ b/include/linux/netdevice.h > @@ -1805,12 +1805,9 @@ struct net_device { > /* Interface address info used in eth_type_trans() */ > unsigned char *dev_addr; > > -#ifdef CONFIG_SYSFS > struct netdev_rx_queue *_rx; > - > unsigned int num_rx_queues; > unsigned int real_num_rx_queues; > -#endif > > struct bpf_prog __rcu *xdp_prog; > unsigned long gro_flush_timeout; >
From: Jesper Dangaard Brouer <brouer@redhat.com> Date: Tue, 09 Jan 2018 23:42:34 +0100 > The commit e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") > removed some ifdef CONFIG_SYSFS in net/core/dev.c, but forgot to > remove the corresponding ifdef's in include/linux/netdevice.h. > > Fixes: e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") > Reported-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Applied.
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 440b000f07f4..b308793c64ce 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1805,12 +1805,9 @@ struct net_device { /* Interface address info used in eth_type_trans() */ unsigned char *dev_addr; -#ifdef CONFIG_SYSFS struct netdev_rx_queue *_rx; - unsigned int num_rx_queues; unsigned int real_num_rx_queues; -#endif struct bpf_prog __rcu *xdp_prog; unsigned long gro_flush_timeout;
The commit e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") removed some ifdef CONFIG_SYSFS in net/core/dev.c, but forgot to remove the corresponding ifdef's in include/linux/netdevice.h. Fixes: e817f85652c1 ("xdp: generic XDP handling of xdp_rxq_info") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> --- include/linux/netdevice.h | 3 --- 1 file changed, 3 deletions(-)