[PATCH] net:dev: Change napi_gro_complete return type to void

Subsystems: networking [general], the rest

STALE1801d

4 messages, 3 authors, 2021-10-02 · open the first message on its own page

[PATCH] net:dev: Change napi_gro_complete return type to void

From: Gyumin Hwang <hidden>
Date: 2021-10-02 06:11:14

napi_gro_complete always returned the same value, NET_RX_SUCCESS
And the value was not used anywhere

Signed-off-by: Gyumin Hwang <redacted>
---
 net/core/dev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index f930329f0dc2..b181cd49167a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5839,7 +5839,7 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb, int se
 		gro_normal_list(napi);
 }
 
-static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
+static void napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
 {
 	struct packet_offload *ptype;
 	__be16 type = skb->protocol;
@@ -5868,12 +5868,12 @@ static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
 	if (err) {
 		WARN_ON(&ptype->list == head);
 		kfree_skb(skb);
-		return NET_RX_SUCCESS;
+		return;
 	}
 
 out:
 	gro_normal_one(napi, skb, NAPI_GRO_CB(skb)->count);
-	return NET_RX_SUCCESS;
+	return;
 }
 
 static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,
-- 
2.25.1

Re: [PATCH] net:dev: Change napi_gro_complete return type to void

From: Joe Perches <joe@perches.com>
Date: 2021-10-02 07:22:11

On Sat, 2021-10-02 at 06:11 +0000, Gyumin Hwang wrote:
napi_gro_complete always returned the same value, NET_RX_SUCCESS
And the value was not used anywhere
[]
quoted hunk
diff --git a/net/core/dev.c b/net/core/dev.c
[]
quoted hunk
@@ -5868,12 +5868,12 @@ static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
 	if (err) {
 		WARN_ON(&ptype->list == head);
 		kfree_skb(skb);
-		return NET_RX_SUCCESS;
+		return;
 	}
 

 out:
 	gro_normal_one(napi, skb, NAPI_GRO_CB(skb)->count);
-	return NET_RX_SUCCESS;
+	return;
unnecessary return at function end
 }

[PATCH v2] net:dev: Change napi_gro_complete return type to void

From: Gyumin Hwang <hidden>
Date: 2021-10-02 08:12:20

napi_gro_complete always returned the same value, NET_RX_SUCCESS
And the value was not used anywhere

Signed-off-by: Gyumin Hwang <redacted>
---
Changes in v2:
  - Remove unnecessary return at function end

 net/core/dev.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index f930329f0dc2..96fd8f77ab6a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5839,7 +5839,7 @@ static void gro_normal_one(struct napi_struct *napi, struct sk_buff *skb, int se
 		gro_normal_list(napi);
 }
 
-static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
+static void napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
 {
 	struct packet_offload *ptype;
 	__be16 type = skb->protocol;
@@ -5868,12 +5868,11 @@ static int napi_gro_complete(struct napi_struct *napi, struct sk_buff *skb)
 	if (err) {
 		WARN_ON(&ptype->list == head);
 		kfree_skb(skb);
-		return NET_RX_SUCCESS;
+		return;
 	}
 
 out:
 	gro_normal_one(napi, skb, NAPI_GRO_CB(skb)->count);
-	return NET_RX_SUCCESS;
 }
 
 static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,
-- 
2.25.1

Re: [PATCH v2] net:dev: Change napi_gro_complete return type to void

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-10-02 13:10:12

Hello:

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

On Sat,  2 Oct 2021 08:11:36 +0000 you wrote:
napi_gro_complete always returned the same value, NET_RX_SUCCESS
And the value was not used anywhere

Signed-off-by: Gyumin Hwang <redacted>
---
Changes in v2:
  - Remove unnecessary return at function end

[...]
Here is the summary with links:
  - [v2] net:dev: Change napi_gro_complete return type to void
    https://git.kernel.org/netdev/net-next/c/1643771eeb2d

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

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help