diff options
| author | Ollie Wild <aaw@google.com> | 2010-09-22 07:54:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-22 22:21:05 +0200 |
| commit | 56b49f4b8f6728b91d10c556c116175051b77b60 (patch) | |
| tree | 2a88008075a90686237b0e8ce1de72db1d5b0747 /include | |
| parent | netfilter: nf_conntrack_defrag: check socket type before touching nodefrag flag (diff) | |
| download | linux-56b49f4b8f6728b91d10c556c116175051b77b60.tar.xz linux-56b49f4b8f6728b91d10c556c116175051b77b60.zip | |
net: Move "struct net" declaration inside the __KERNEL__ macro guard
This patch reduces 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.
(This came up because we have several C++ applications which use "net" as a
namespace name.)
Signed-off-by: Ollie Wild <aaw@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 59d066936ab9..123566912d73 100644 --- a/include/linux/netlink.h +++ b/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; |