diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-14 00:37:03 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-14 16:04:44 +0200 |
commit | c69a22fb9675a154f0264e77ca5d83fee95695d9 (patch) | |
tree | e5be6c479ca0543f4415d30f3b2409958b8f5d81 /patches | |
parent | b0369c7a9c588c93d0b66ec8c4d95cbc8dcc58b2 (diff) |
patches: fix spatch for bluetooth
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@hauke-m.de>
Cc: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/0054-struct-proto_ops-sig.cocci | 8 |
1 files 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 0c0845ad..64df8ab5 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) */ |