From: David S. Miller <davem@davemloft.net>
Date: Sat, 16 Apr 2005 22:24:09 +0000 (-0700)
Subject: [PATCH] Fix linux/atalk.h header
X-Git-Tag: v2.6.12-rc3~225
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9f3786dc8b1d6229dbe76e364323f0d787e7a0ea;p=~emulex%2Finfiniband.git

[PATCH] Fix linux/atalk.h header

This recently got changed to include a lot of kernel internal stuff in the
non-__KERNEL__ area of the header, which isn't so kosher and breaks libc
builds.

The fix is pretty simple.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 55fcfc11fdc..31d3fc25ccb 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -1,8 +1,6 @@
 #ifndef __LINUX_ATALK_H__
 #define __LINUX_ATALK_H__
 
-#include <net/sock.h>
-
 /*
  * AppleTalk networking structures
  *
@@ -39,6 +37,10 @@ struct atalk_netrange {
 	__u16	nr_lastnet;
 };
 
+#ifdef __KERNEL__
+
+#include <net/sock.h>
+
 struct atalk_route {
 	struct net_device  *dev;
 	struct atalk_addr  target;
@@ -81,8 +83,6 @@ static inline struct atalk_sock *at_sk(struct sock *sk)
 	return (struct atalk_sock *)sk;
 }
 
-#ifdef __KERNEL__
-
 #include <asm/byteorder.h>
 
 struct ddpehdr {