The patch titled
include/linux/netlink.h: move "struct net" declaration inside the __KERNEL__ macro guard
has been added to the -mm tree. Its filename is
include-linux-netlinkh-move-struct-net-declaration-inside-the-__kernel__-macro-guard.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://userweb.kernel.org/~akpm/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: include/linux/netlink.h: move "struct net" declaration inside the __KERNEL__ macro guard
From: Ollie Wild <aaw@xxxxxxxxxx>
Reduce namespace pollution by moving the "struct net" declaration out of
the userspace-facing portion of linux/netlink.h. It has no impact on the
kernel, and the declaration is not referenced anywhere outside the
__KERNEL__ macro guard.
This came up because we have several C++ applications which use "net" as a
namespace name.
Signed-off-by: Ollie Wild <aaw@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/netlink.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN include/linux/netlink.h~include-linux-netlinkh-move-struct-net-declaration-inside-the-__kernel__-macro-guard include/linux/netlink.h
--- a/include/linux/netlink.h~include-linux-netlinkh-move-struct-net-declaration-inside-the-__kernel__-macro-guard
+++ a/include/linux/netlink.h
@@ -27,8 +27,6 @@
#define MAX_LINKS 32
-struct net;
-
struct sockaddr_nl {
sa_family_t nl_family; /* AF_NETLINK */
unsigned short nl_pad; /* zero */
@@ -151,6 +149,8 @@ struct nlattr {
#include <linux/capability.h>
#include <linux/skbuff.h>
+struct net;
+
static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
{
return (struct nlmsghdr *)skb->data;
_
Patches currently in -mm which might be from aaw@xxxxxxxxxx are
include-linux-netlinkh-move-struct-net-declaration-inside-the-__kernel__-macro-guard.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
