2021-06-13 14:29:00

by Alex Elder

Subject: [PATCH net-next v2 1/1] net: qualcomm: rmnet: always expose a few functions

A recent change tidied up some conditional code, avoiding the use of
some #ifdefs. Unfortunately, if CONFIG_IPV6 was not enabled, it
meant that two functions were referenced but never defined.

The easiest fix is to just define stubs for these functions if
CONFIG_IPV6 is not defined. This will soon be simplified further
by some other development in the works...

Reported-by: kernel test robot <[email protected]>
Fixes: 75db5b07f8c39 ("net: qualcomm: rmnet: eliminate some ifdefs")
Signed-off-by: Alex Elder <[email protected]>
---
v2: Rebased on current net-next/master; this fixes a bug there.

.../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
index a6ce22f60a00c..39fba3a347fa6 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
@@ -153,6 +153,14 @@ rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb,
priv->stats.csum_ok++;
return 0;
}
+#else
+static int
+rmnet_map_ipv6_dl_csum_trailer(struct sk_buff *skb,
+ struct rmnet_map_dl_csum_trailer *csum_trailer,
+ struct rmnet_priv *priv)
+{
+ return 0;
+}
#endif

static void rmnet_map_complement_ipv4_txporthdr_csum_field(void *iphdr)
@@ -223,6 +231,13 @@ rmnet_map_ipv6_ul_csum_header(struct ipv6hdr *ipv6hdr,

rmnet_map_complement_ipv6_txporthdr_csum_field(ipv6hdr);
}
+#else
+static void
+rmnet_map_ipv6_ul_csum_header(void *ip6hdr,
+ struct rmnet_map_ul_csum_header *ul_header,
+ struct sk_buff *skb)
+{
+}
#endif

static void rmnet_map_v5_checksum_uplink_packet(struct sk_buff *skb,
--
2.27.0

2021-06-14 19:52:08

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next v2 1/1] net: qualcomm: rmnet: always expose a few functions

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Sun, 13 Jun 2021 09:25:22 -0500 you wrote:
> A recent change tidied up some conditional code, avoiding the use of
> some #ifdefs. Unfortunately, if CONFIG_IPV6 was not enabled, it
> meant that two functions were referenced but never defined.
>
> The easiest fix is to just define stubs for these functions if
> CONFIG_IPV6 is not defined. This will soon be simplified further
> by some other development in the works...
>
> [...]

Here is the summary with links:
- [net-next,v2,1/1] net: qualcomm: rmnet: always expose a few functions
https://git.kernel.org/netdev/net-next/c/b84b53ee8337

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html