* [net] Revert "tipc: Return the correct errno code"
@ 2021-08-11 1:22 Hoang Le
2021-08-12 8:45 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Hoang Le @ 2021-08-11 1:22 UTC (permalink / raw)
To: jmaloy, maloy, ying.xue, kuba, davem, netdev, zhengyongjun3,
tung.q.nguyen, tipc-discussion
This reverts commit 0efea3c649f0 because of:
- The returning -ENOBUF error is fine on socket buffer allocation.
- There is side effect in the calling path
tipc_node_xmit()->tipc_link_xmit() when checking error code returning.
Fixes: 0efea3c649f0 ("tipc: Return the correct errno code")
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
---
net/tipc/link.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index cf586840caeb..1b7a487c8841 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -913,7 +913,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
dnode, l->addr, dport, 0, 0);
if (!skb)
- return -ENOMEM;
+ return -ENOBUFS;
msg_set_dest_droppable(buf_msg(skb), true);
TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
skb_queue_tail(&l->wakeupq, skb);
@@ -1031,7 +1031,7 @@ void tipc_link_reset(struct tipc_link *l)
*
* Consumes the buffer chain.
* Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
- * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS or -ENOMEM
+ * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
*/
int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
struct sk_buff_head *xmitq)
@@ -1089,7 +1089,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
if (!_skb) {
kfree_skb(skb);
__skb_queue_purge(list);
- return -ENOMEM;
+ return -ENOBUFS;
}
__skb_queue_tail(transmq, skb);
tipc_link_set_skb_retransmit_time(skb, l);
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net] Revert "tipc: Return the correct errno code"
2021-08-11 1:22 [net] Revert "tipc: Return the correct errno code" Hoang Le
@ 2021-08-12 8:45 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-12 8:45 UTC (permalink / raw)
To: Hoang Le
Cc: jmaloy, maloy, ying.xue, kuba, davem, netdev, zhengyongjun3,
tung.q.nguyen, tipc-discussion
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Wed, 11 Aug 2021 08:22:09 +0700 you wrote:
> This reverts commit 0efea3c649f0 because of:
> - The returning -ENOBUF error is fine on socket buffer allocation.
> - There is side effect in the calling path
> tipc_node_xmit()->tipc_link_xmit() when checking error code returning.
>
> Fixes: 0efea3c649f0 ("tipc: Return the correct errno code")
> Acked-by: Jon Maloy <jmaloy@redhat.com>
> Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
>
> [...]
Here is the summary with links:
- [net] Revert "tipc: Return the correct errno code"
https://git.kernel.org/netdev/net/c/86704993e6a5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-12 8:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-11 1:22 [net] Revert "tipc: Return the correct errno code" Hoang Le
2021-08-12 8:45 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).