[net-next] net: add an empty __netif_set_xps_queue() stab in the !CONFIG_XPS case

Message ID 20180810010428.6096-1-avagin@openvz.org
State Not Applicable
Delegated to: David Miller
Headers show
Series
  • [net-next] net: add an empty __netif_set_xps_queue() stab in the !CONFIG_XPS case
Related show

Commit Message

Andrei Vagin Aug. 10, 2018, 1:04 a.m.
From: Andrei Vagin <avagin@gmail.com>

__netif_set_xps_queue() is used in drivers/net/virtio_net.c.

Fixes: 4d99f6602cb5 ("net: allow to call netif_reset_xps_queues() under cpus_read_lock")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 include/linux/netdevice.h | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

kbuild test robot Aug. 12, 2018, 5:25 p.m. | #1
Hi Andrei,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]

url:    https://github.com/0day-ci/linux/commits/Andrei-Vagin/net-add-an-empty-__netif_set_xps_queue-stab-in-the-CONFIG_XPS-case/20180813-001123
config: i386-tinyconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-16) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   In file included from include/linux/icmpv6.h:13:0,
                    from include/linux/ipv6.h:86,
                    from include/net/ipv6.h:16,
                    from include/linux/sunrpc/clnt.h:28,
                    from include/linux/nfs_fs.h:32,
                    from init/do_mounts.c:32:
>> include/linux/netdevice.h:3423:19: error: redefinition of '__netif_set_xps_queue'
    static inline int __netif_set_xps_queue(struct net_device *dev,
                      ^~~~~~~~~~~~~~~~~~~~~
   include/linux/netdevice.h:3409:19: note: previous definition of '__netif_set_xps_queue' was here
    static inline int __netif_set_xps_queue(struct net_device *dev,
                      ^~~~~~~~~~~~~~~~~~~~~

vim +/__netif_set_xps_queue +3423 include/linux/netdevice.h

c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3422  
c9fbb2d2 Krzysztof Kozlowski 2018-08-10 @3423  static inline int __netif_set_xps_queue(struct net_device *dev,
c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3424  					const unsigned long *mask,
c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3425  					u16 index, bool is_rxqs_map)
c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3426  {
c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3427  	return 0;
c9fbb2d2 Krzysztof Kozlowski 2018-08-10  3428  }
537c00de Alexander Duyck     2013-01-10  3429  #endif
537c00de Alexander Duyck     2013-01-10  3430  

:::::: The code at line 3423 was first introduced by commit
:::::: c9fbb2d25295a566b97d62e6904741e8e1702d83 net: Provide stub for __netif_set_xps_queue if there is no CONFIG_XPS

:::::: TO: Krzysztof Kozlowski <krzk@kernel.org>
:::::: CC: David S. Miller <davem@davemloft.net>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 282e2e95ad5b..a5e4b0a18f90 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3406,6 +3406,13 @@  static inline int netif_attrmask_next_and(int n, const unsigned long *src1p,
 	return n + 1;
 }
 #else
+static inline int __netif_set_xps_queue(struct net_device *dev,
+					const unsigned long *mask,
+					u16 index, bool is_rxqs_map)
+{
+	return 0;
+}
+
 static inline int netif_set_xps_queue(struct net_device *dev,
 				      const struct cpumask *mask,
 				      u16 index)