[NEIGH]: Move netlink neighbour bits to linux/neighbour.h

Moves netlink neighbour bits to linux/neighbour.h. Also
moves bits to be exported to userspace from net/neighbour.h
to linux/neighbour.h and removes __KERNEL__ guards, userspace
is not supposed to be using it.

rtnetlink_rcv_msg() is not longer required to parse attributes
for the neighbour layer, remove dependency on obsolete and
buggy rta_buf.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 37 deletions

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4901ee446879..74c4b6ff8a5c 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -1,6 +1,8 @@
 #ifndef _NET_NEIGHBOUR_H
 #define _NET_NEIGHBOUR_H
 
+#include <linux/neighbour.h>
+
 /*
  *      Generic neighbour manipulation
  *
@@ -14,40 +16,6 @@
  *              - Add neighbour cache statistics like rtstat
  */
 
-/* The following flags & states are exported to user space,
-   so that they should be moved to include/linux/ directory.
- */
-
-/*
- *      Neighbor Cache Entry Flags
- */
-
-#define NTF_PROXY       0x08    /* == ATF_PUBL */
-#define NTF_ROUTER      0x80
-
-/*
- *      Neighbor Cache Entry States.
- */
-
-#define NUD_INCOMPLETE  0x01
-#define NUD_REACHABLE   0x02
-#define NUD_STALE       0x04
-#define NUD_DELAY       0x08
-#define NUD_PROBE       0x10
-#define NUD_FAILED      0x20
-
-/* Dummy states */
-#define NUD_NOARP       0x40
-#define NUD_PERMANENT   0x80
-#define NUD_NONE        0x00
-
-/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
-   and make no address resolution or NUD.
-   NUD_PERMANENT is also cannot be deleted by garbage collectors.
- */
-
-#ifdef __KERNEL__
-
 #include <asm/atomic.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -374,6 +342,3 @@ struct neighbour_cb {
 #define NEIGH_CB(skb)   ((struct neighbour_cb *)(skb)->cb)
 
 #endif
-#endif
-
-