Convert header file to UAPI

diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild
index 21c91bf25a298c9090d103e1fe41406e72a7ae20..8692af426af07aa83e55df4f71dbe9d630612eac 100644 (file)
--- 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 65d9cc51b8e9dd36042e978b385918c129bf141d..f12e054850d6a35d90594b5d5df85abd9ecd1494 100644 (file)
--- 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 1c99facc53e4cfd8d2056bbca8b56768ae7ee52d..ff88f3c383a2f801ce9f6d573b218b3117c8b6b0 100644 (file)
--- 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);