From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 20 Dec 2012 13:40:32 +0000 (+0100)
Subject: Convert header file to UAPI
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/can-eth-gw-linux.git/commitdiff_plain/679ea3e3d7140712cc066a93e1917cf83571b5a4

Convert header file to UAPI
---

diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild
index 21c91bf25a29..8692af426af0 100644
--- a/include/uapi/linux/can/Kbuild
+++ b/include/uapi/linux/can/Kbuild
@@ -1,5 +1,6 @@
 # UAPI Header export list
 header-y += bcm.h
+header-y += canethgw.h
 header-y += error.h
 header-y += gw.h
 header-y += netlink.h
diff --git a/include/linux/can/canethgw.h b/include/uapi/linux/can/canethgw.h
similarity index 64%
rename from include/linux/can/canethgw.h
rename to include/uapi/linux/can/canethgw.h
index 65d9cc51b8e9..f12e054850d6 100644
--- a/include/linux/can/canethgw.h
+++ b/include/uapi/linux/can/canethgw.h
@@ -12,19 +12,7 @@ struct cegw_ioctl
 	struct sockaddr_in udp_dst[0];
 };
 
-#ifdef __KERNEL__
-struct cegw_job
-{
-	struct kref refcount;
-	struct socket* can_sock;
-	struct socket* udp_sock;
-	__u32  udp_dstcnt;
-	struct sockaddr_in udp_dst[0];
-};
-#endif
-
 #define CEGW_IOCTL_BASE 'c'
 #define CEGW_IOCTL_START _IOW(CEGW_IOCTL_BASE, 0, struct cegw_ioctl)
 
 #endif /* CANETHGW_H */
-
diff --git a/net/can/canethgw.c b/net/can/canethgw.c
index 1c99facc53e4..ff88f3c383a2 100644
--- a/net/can/canethgw.c
+++ b/net/can/canethgw.c
@@ -24,6 +24,15 @@
 
 MODULE_LICENSE("GPL");
 
+struct cegw_job
+{
+	struct kref refcount;
+	struct socket* can_sock;
+	struct socket* udp_sock;
+	__u32  udp_dstcnt;
+	struct sockaddr_in udp_dst[0];
+};
+
 static int cegw_udp2can(void *data);
 static int cegw_udp_send(struct socket *udp_sock, struct can_frame *cf,
 		struct sockaddr_in* addr);