[PATCH v2 4/7] headers: backport sk_error_report

Jiaxun Yang <[email protected]>
Newsgroups org.kernel.vger.backports
Message-ID <[email protected]>
It is required by QRTR.
Backproted from 5.14 and dropped trace_event part as the event
doesn't exist in earlier versions and it won't have functional
impact.

Signed-off-by: Jiaxun Yang <[email protected]>
---
 backport/backport-include/net/sock.h | 8 ++++++++
 backport/compat/backport-genetlink.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backport/backport-include/net/sock.h b/backport/backport-include/net/sock.h
index d99ef794..06a76aec 100644
--- a/backport/backport-include/net/sock.h
+++ b/backport/backport-include/net/sock.h
@@ -32,4 +32,12 @@ static inline void sk_pacing_shift_update(struct sock *sk, int val)
 }
 #endif /* < 4.16 */
 
+#if LINUX_VERSION_IS_LESS(5,14,0)
+static inline void backport_sk_error_report(struct sock *sk)
+{
+	sk->sk_error_report(sk);
+}
+#define sk_error_report LINUX_BACKPORT(sk_error_report)
+#endif /* <= 5.14 */
+
 #endif /* __BACKPORT_NET_SOCK_H */
diff --git a/backport/compat/backport-genetlink.c b/backport/compat/backport-genetlink.c
index 89cdd9c0..6ba31b6e 100644
--- a/backport/compat/backport-genetlink.c
+++ b/backport/compat/backport-genetlink.c
@@ -86,7 +86,7 @@ static void extack_netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh,
 	skb = nlmsg_new(payload + tlvlen, GFP_KERNEL);
 	if (!skb) {
 		NETLINK_CB(in_skb).sk->sk_err = ENOBUFS;
-		NETLINK_CB(in_skb).sk->sk_error_report(NETLINK_CB(in_skb).sk);
+		sk_error_report(NETLINK_CB(in_skb).sk);
 		return;
 	}
 
-- 
2.35.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.