Commit 8e879bf1f in backports converted some bluetooth patches into an
spatch. There was a problem in this conversion, the second argument is
not struct socket, but struct sock. This causes some warnings in the
kernel build.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Cc: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx>
---
.../collateral-evolutions/network/0054-struct-proto_ops-sig.cocci | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/patches/collateral-evolutions/network/0054-struct-proto_ops-sig.cocci b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig.cocci
index 0c0845a..64df8ab 100644
--- a/patches/collateral-evolutions/network/0054-struct-proto_ops-sig.cocci
+++ b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig.cocci
@@ -126,10 +126,10 @@ send_func(...)
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-+static int backport_send(struct kiocb *iocb, struct socket *sock,
++static int backport_send(struct kiocb *iocb, struct sock *sk,
+ struct msghdr *msg, size_t len)
+{
-+ return send_func(sock, msg, len);
++ return send_func(sk, msg, len);
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) */
@@ -144,11 +144,11 @@ recv_func(...)
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-+static int backport_recv(struct kiocb *iocb, struct socket *sock,
++static int backport_recv(struct kiocb *iocb, struct sock *sk,
+ struct msghdr *msg, size_t len,
+ int noblock, int flags, int *addr_len)
+{
-+ return recv_func(sock, msg, len, noblock, flags, addr_len);
++ return recv_func(sk, msg, len, noblock, flags, addr_len);
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) */
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
