Commit 56b49f4b authored by Ollie Wild's avatar Ollie Wild Committed by David S. Miller

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: default avatarOllie Wild <aaw@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbdd769a
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#define MAX_LINKS 32 #define MAX_LINKS 32
struct net;
struct sockaddr_nl { struct sockaddr_nl {
sa_family_t nl_family; /* AF_NETLINK */ sa_family_t nl_family; /* AF_NETLINK */
unsigned short nl_pad; /* zero */ unsigned short nl_pad; /* zero */
...@@ -151,6 +149,8 @@ struct nlattr { ...@@ -151,6 +149,8 @@ struct nlattr {
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
struct net;
static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb) static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
{ {
return (struct nlmsghdr *)skb->data; return (struct nlmsghdr *)skb->data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment