Merge pull request torvalds#168 from opurdila/fix-sockaddr

Fix sockaddr
laijs · Jun 18, 2016 · e9c3b4a · e9c3b4a
2 parents 0609875 + 059a2dc
commit e9c3b4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/arch/lkl/include/uapi/asm/syscalls.h b/arch/lkl/include/uapi/asm/syscalls.h
@@ -37,8 +37,6 @@ typedef __s64			s64;
 
 #define __user
 
-#define sockaddr __lkl__kernel_sockaddr_storage
-
 #include <asm/unistd.h>
 /* Temporary undefine system calls that don't have data types defined in UAPI
  * headers */
@@ -92,6 +90,14 @@ typedef __s64			s64;
 #include <asm/siginfo.h>
 #include <linux/utime.h>
 #include <asm/socket.h>
+
+/* Define data structures used in system calls that are not defined in UAPI
+ * headers */
+struct sockaddr {
+	unsigned short int sa_family;
+	char sa_data[14];
+};
+
 #include <linux/if.h>
 #define __UAPI_DEF_IN_IPPROTO	1
 #define __UAPI_DEF_IN_ADDR	1
@@ -110,8 +116,6 @@ typedef __s64			s64;
 #include <linux/virtio_net.h>
 #include <linux/virtio_ring.h>
 
-/* Define data structures used in system calls that are not defined in UAPI
- * headers */
 struct user_msghdr {
 	void		__user *msg_name;	/* ptr to socket address structure */
 	int		msg_namelen;		/* size of socket address structure */

diff --git a/tools/lkl/tests/net-test.c b/tools/lkl/tests/net-test.c
@@ -70,7 +70,7 @@ static int test_icmp(char *str, int len)
 	inet_aton(dst, &saddr.sin_addr);
 
 	ret = lkl_sys_sendto(sock, icmp, sizeof(*icmp), 0,
-			     (struct __lkl__kernel_sockaddr_storage *)&saddr,
+			     (struct lkl_sockaddr*)&saddr,
 			     sizeof(saddr));
 	if (ret < 0) {
 		snprintf(str, len, "sendto error (%s)", strerror(errno));

diff --git a/tools/lkl/tests/run_netperf.sh b/tools/lkl/tests/run_netperf.sh
@@ -56,11 +56,11 @@ then
   exit 1
 fi
 
-function clean {
+clean() {
     sudo killall netserver &> /dev/null || true
 }
 
-function clean_with_tap {
+clean_with_tap() {
     sudo ip link set dev $LKL_HIJACK_NET_IFPARAMS down &> /dev/null || true
     sudo ip tuntap del dev $LKL_HIJACK_NET_IFPARAMS mode tap &> /dev/null || true
     clean