mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-26 11:40:24 +02:00
pktgen: avoid unused-const-variable warning
When extra warnings are enable, there are configurations that build
pktgen without CONFIG_XFRM, which leaves a static const variable unused:
net/core/pktgen.c:213:1: error: unused variable 'F_IPSEC' [-Werror,-Wunused-const-variable]
213 | PKT_FLAGS
| ^~~~~~~~~
net/core/pktgen.c:197:2: note: expanded from macro 'PKT_FLAGS'
197 | pf(IPSEC) /* ipsec on for flows */ \
| ^~~~~~~~~
This could be marked as __maybe_unused, or by making the one use visible
to the compiler by slightly rearranging the #ifdef blocks. The second
variant looks slightly nicer here, so use that.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Link: https://patch.msgid.link/20250225085722.469868-1-arnd@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
committed by
Paolo Abeni
parent
0493f7a54e
commit
af4a5da8ed
+2
-7
@@ -158,9 +158,7 @@
|
||||
#include <net/udp.h>
|
||||
#include <net/ip6_checksum.h>
|
||||
#include <net/addrconf.h>
|
||||
#ifdef CONFIG_XFRM
|
||||
#include <net/xfrm.h>
|
||||
#endif
|
||||
#include <net/netns/generic.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <linux/rcupdate.h>
|
||||
@@ -2363,13 +2361,13 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_XFRM
|
||||
/* If there was already an IPSEC SA, we keep it as is, else
|
||||
* we go look for it ...
|
||||
*/
|
||||
#define DUMMY_MARK 0
|
||||
static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
|
||||
{
|
||||
#ifdef CONFIG_XFRM
|
||||
struct xfrm_state *x = pkt_dev->flows[flow].x;
|
||||
struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id);
|
||||
if (!x) {
|
||||
@@ -2395,11 +2393,10 @@ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
static void set_cur_queue_map(struct pktgen_dev *pkt_dev)
|
||||
{
|
||||
|
||||
if (pkt_dev->flags & F_QUEUE_MAP_CPU)
|
||||
pkt_dev->cur_queue_map = smp_processor_id();
|
||||
|
||||
@@ -2574,10 +2571,8 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
|
||||
pkt_dev->flows[flow].flags |= F_INIT;
|
||||
pkt_dev->flows[flow].cur_daddr =
|
||||
pkt_dev->cur_daddr;
|
||||
#ifdef CONFIG_XFRM
|
||||
if (pkt_dev->flags & F_IPSEC)
|
||||
get_ipsec_sa(pkt_dev, flow);
|
||||
#endif
|
||||
pkt_dev->nflows++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user