jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-fusion: fix build issue with Linux >= 4.7

Browse Source 
The size parameter from sock_recvmsg() was removed from Linux kernel
API since 4.7. This commit adjusts the existing
0004-Port-one-one_udp.c-to-Linux-4.1.patch to fix the build with Linux
>= 4.7.

Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
[Thomas: improved commit title/log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Matthew Shyu 2017-07-04 11:12:38 +08:00 committed by Thomas Petazzoni
parent 81597b82e2
commit 0ae2cab416
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch
View File

@ -24,12 +24,20 @@ one/one_udp.c: In function 'ksocket_send_iov':
one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg' one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg'
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Kernel commit 2da62906b1e29 dropped the size parameter in sock_recvmsg
since 4.7
In function 'ksocket_receive'
one/one_udp.c:235:13: error: too many arguments to function 'sock_recvmsg'
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
--- ---
one/one_udp.c | 30 +++++++++++++++--------------- one/one_udp.c | 34 +++++++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-) 1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/one/one_udp.c b/one/one_udp.c diff --git a/one/one_udp.c b/one/one_udp.c
index 26b9e6a1f729..b1daae164cdf 100644 index 26b9e6a..9b59529 100644
--- a/one/one_udp.c --- a/one/one_udp.c
+++ b/one/one_udp.c +++ b/one/one_udp.c
@@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock, @@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock,
@ -78,7 +86,7 @@ index 26b9e6a1f729..b1daae164cdf 100644
struct iovec iov; struct iovec iov;
mm_segment_t oldfs; mm_segment_t oldfs;
int size = 0; int size = 0;
@@ -213,14 +215,12 @@ ksocket_receive(struct socket* sock, struct sockaddr_in* addr, void *buf, int le @@ -213,18 +215,20 @@ ksocket_receive(struct socket* sock, struct sockaddr_in* addr, void *buf, int le
iov.iov_base = buf; iov.iov_base = buf;
iov.iov_len = len; iov.iov_len = len;
@ -97,3 +105,14 @@ index 26b9e6a1f729..b1daae164cdf 100644
oldfs = get_fs(); oldfs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) // commit 2da62906b1e29
size = sock_recvmsg(sock,&msg,len,msg.msg_flags);
+#else
+ size = sock_recvmsg(sock, &msg,msg.msg_flags);
+#endif
set_fs(oldfs);
return size;
--
2.11.0