* [PATCH stable 4.1 0/2] Remove build warnings due to backports
@ 2017-09-19 0:51 Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 1/2] of: fdt: Fix return value in __unflatten_device_tree() Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive() Florian Fainelli
0 siblings, 2 replies; 3+ messages in thread
From: Florian Fainelli @ 2017-09-19 0:51 UTC (permalink / raw)
To: alexander.levin; +Cc: linux-kernel, stable, johan, jesse, Florian Fainelli
Hi Sasha,
Please find two patches that fix build warnings that I just met while merging
4.1.43 locally.
Thanks!
Florian Fainelli (2):
of: fdt: Fix return value in __unflatten_device_tree()
ipv6: Remove sit_gro_receive()
drivers/of/fdt.c | 2 +-
net/ipv6/ip6_offload.c | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
--
2.14.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH stable 4.1 1/2] of: fdt: Fix return value in __unflatten_device_tree()
2017-09-19 0:51 [PATCH stable 4.1 0/2] Remove build warnings due to backports Florian Fainelli
@ 2017-09-19 0:51 ` Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive() Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2017-09-19 0:51 UTC (permalink / raw)
To: alexander.levin; +Cc: linux-kernel, stable, johan, jesse, Florian Fainelli
Commit 78de28c67c8f ("of: fdt: add missing allocation-failure check")
would make us return NULL in a function declared to return void as of
the 4.1 kernel.
Fixes: 78de28c67c8f ("of: fdt: add missing allocation-failure check")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/of/fdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index bf89754fe973..308a95ead432 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -413,7 +413,7 @@ static void __unflatten_device_tree(void *blob,
/* Allocate memory for the expanded device tree */
mem = dt_alloc(size + 4, __alignof__(struct device_node));
if (!mem)
- return NULL;
+ return;
memset(mem, 0, size);
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive()
2017-09-19 0:51 [PATCH stable 4.1 0/2] Remove build warnings due to backports Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 1/2] of: fdt: Fix return value in __unflatten_device_tree() Florian Fainelli
@ 2017-09-19 0:51 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2017-09-19 0:51 UTC (permalink / raw)
To: alexander.levin; +Cc: linux-kernel, stable, johan, jesse, Florian Fainelli
This was backported as part of 066b300e5be4 ("tunnels: Don't apply GRO
to multiple layers of encapsulation.") but nothing uses this function,
thus resulting in this build warning:
net/ipv6/ip6_offload.c:264:25: warning: 'sit_gro_receive' defined but
not used [-Wunused-function]
static struct sk_buff **sit_gro_receive(struct sk_buff **head,
^
Just drop it for now.
Fixes: 066b300e5be4 ("tunnels: Don't apply GRO to multiple layers of encapsulation.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/ipv6/ip6_offload.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 606a07890c68..1cb68e01c301 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -261,19 +261,6 @@ out:
return pp;
}
-static struct sk_buff **sit_gro_receive(struct sk_buff **head,
- struct sk_buff *skb)
-{
- if (NAPI_GRO_CB(skb)->encap_mark) {
- NAPI_GRO_CB(skb)->flush = 1;
- return NULL;
- }
-
- NAPI_GRO_CB(skb)->encap_mark = 1;
-
- return ipv6_gro_receive(head, skb);
-}
-
static int ipv6_gro_complete(struct sk_buff *skb, int nhoff)
{
const struct net_offload *ops;
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-19 0:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-19 0:51 [PATCH stable 4.1 0/2] Remove build warnings due to backports Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 1/2] of: fdt: Fix return value in __unflatten_device_tree() Florian Fainelli
2017-09-19 0:51 ` [PATCH stable 4.1 2/2] ipv6: Remove sit_gro_receive() Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.