The patch titled
linux/atm_tcp.h linux/atm.h: cleanup for userspace
has been added to the -mm tree. Its filename is
linux-atm_tcph-linux-atmh-cleanup-for-userspace.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: linux/atm_tcp.h linux/atm.h: cleanup for userspace
From: Mike Frysinger <vapier@xxxxxxxxxx>
The atm_tcp.h uses types from linux/atm.h, but does not include it. It
should also use the standard __u## types from linux/types.h rather than
the uint##_t types since the former can be found with the kernel already.
Same goes for linux/atm.h. The linux/socket.h include there also gets
dropped as atm.h does not actually use anything from socket.h.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/atm.h | 7 ++-----
include/linux/atm_tcp.h | 12 +++++-------
2 files changed, 7 insertions(+), 12 deletions(-)
diff -puN include/linux/atm.h~linux-atm_tcph-linux-atmh-cleanup-for-userspace include/linux/atm.h
--- a/include/linux/atm.h~linux-atm_tcph-linux-atmh-cleanup-for-userspace
+++ a/include/linux/atm.h
@@ -16,14 +16,11 @@
* documentation. Do not change them.
*/
-#ifdef __KERNEL__
-#include <linux/socket.h>
-#include <linux/types.h>
-#endif
#include <linux/compiler.h>
#include <linux/atmapi.h>
#include <linux/atmsap.h>
#include <linux/atmioc.h>
+#include <linux/types.h>
/* general ATM constants */
@@ -212,7 +209,7 @@ struct sockaddr_atmsvc {
char pub[ATM_E164_LEN+1]; /* public address (E.164) */
/* unused addresses must be bzero'ed */
char lij_type; /* role in LIJ call; one of ATM_LIJ* */
- uint32_t lij_id; /* LIJ call identifier */
+ __u32 lij_id; /* LIJ call identifier */
} sas_addr __ATM_API_ALIGN; /* SVC address */
};
diff -puN include/linux/atm_tcp.h~linux-atm_tcph-linux-atmh-cleanup-for-userspace include/linux/atm_tcp.h
--- a/include/linux/atm_tcp.h~linux-atm_tcph-linux-atmh-cleanup-for-userspace
+++ a/include/linux/atm_tcp.h
@@ -8,11 +8,9 @@
#define LINUX_ATM_TCP_H
#include <linux/atmapi.h>
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#endif
+#include <linux/atm.h>
#include <linux/atmioc.h>
+#include <linux/types.h>
/*
@@ -20,9 +18,9 @@
*/
struct atmtcp_hdr {
- uint16_t vpi;
- uint16_t vci;
- uint32_t length; /* ... of data part */
+ __u16 vpi;
+ __u16 vci;
+ __u32 length; /* ... of data part */
};
/*
_
Patches currently in -mm which might be from vapier@xxxxxxxxxx are
linux-atm_tcph-linux-atmh-cleanup-for-userspace.patch
asm-alphah8300umv850xtensa-paramh-unbreak-hz-for-userspace.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
