[BRIDGE]: Include file cleanup.

Cleanup some of the include file's in the bridge code.
* if_bridge.h defines net_bridge, but not needed as part of the API.
* get rid of places that include if_bridge.h and uaccess.h but don't
  actually do API work.

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 099368acb7ed806a7d6c28d5a2dc7e299c0a17b9..5dff099e76b577988d369430aea2ad193594d9cb 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -98,9 +98,6 @@ struct __fdb_entry
 
 #include <linux/netdevice.h>
 
-struct net_bridge;
-struct net_bridge_port;
-
 extern void brioctl_set(int (*ioctl_hook)(unsigned long));
 extern int (*br_handle_frame_hook)(struct sk_buff *skb);
 extern int (*br_should_route_hook)(struct sk_buff **pskb);

diff --git a/net/bridge/br.c b/net/bridge/br.c
index d4e9bc580edb23e340e4db1c3db82392614cd030..e5f6c19236f40cb994fa93b5b3ba8cb65bfec16b 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -20,8 +20,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/if_bridge.h>
-#include <asm/uaccess.h>
+
 #include "br_private.h"
 
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 6408fd1c4e110b607f8c5772e55866cdc58a54ea..1b8dbdd9fe1c2d459cdf30cddc9290e2859d4b08 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -15,7 +15,6 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/if_bridge.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include "br_private.h"

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 00bc0e70fa17e84572c74bb76ae217074babaff2..1589763867d0dee139c3250a9973833d0b21818d 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -15,9 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/inetdevice.h>
 #include <linux/skbuff.h>
-#include <linux/if_bridge.h>
 #include <linux/netfilter_bridge.h>
 #include "br_private.h"
 

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2f9ebbfa7b4f895e387ed2ed0682db79dbbd2429..e14c19d0cd1c42a4a535f8928b92aa170edc422b 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -15,13 +15,11 @@
 
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
-#include <linux/if_bridge.h>
-#include <linux/inetdevice.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <net/sock.h>
-#include <asm/uaccess.h>
+
 #include "br_private.h"
 
 /* Limited to 256 ports because of STP protocol pdu */

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 483aa63e3092a279430793769dd9a533f429f15e..6a69ace0fc72c4be85af000dc187254643d25411 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/if_bridge.h>
 #include <linux/netfilter_bridge.h>
 #include "br_private.h"
 

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 346a4fb7e1f715b5162ae612755f67d4027a4f23..03d9952a5becdd07b5d98e338ef7248553036cfa 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -15,7 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/if_bridge.h>
-#include <linux/inetdevice.h>
+#include <linux/netdevice.h>
 #include <asm/uaccess.h>
 #include "br_private.h"
 

diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 471d22180f81b7eb42dbd1ac69c74f9704748a48..594bb5bca5d7f46725634c82025fa5ff5c7aee59 100644 (file)
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/if_bridge.h>
+
 #include "br_private.h"
 
 static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr);

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index b833444f9fa4546a053df65bbfb2e92208a23c5d..d69a2faf083e68e22894cbffb7d5a706e2020617 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -13,9 +13,8 @@
  *     2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
-#include <linux/if_bridge.h>
 #include <linux/smp_lock.h>
-#include <asm/uaccess.h>
+
 #include "br_private.h"
 #include "br_private_stp.h"
 

diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 341a5ccb5c54fee8abe43d1fddce793a04d57d54..b91a875aca01c23f0b37b7916cad225e0c5f9fe5 100644 (file)
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -14,9 +14,8 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/if_ether.h>
-#include <linux/if_bridge.h>
 #include <linux/netfilter_bridge.h>
+
 #include "br_private.h"
 #include "br_private_stp.h"
 

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index b6d9ddc6102cb82c1f4d8a3f60415564b18a377e..cb7789b0f84a4aad0d88491d211c105b0c4d3666 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -14,9 +14,8 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/if_bridge.h>
 #include <linux/smp_lock.h>
-#include <asm/uaccess.h>
+
 #include "br_private.h"
 #include "br_private_stp.h"
 

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index eb106a4042fde65876bad56493c23247f91398f9..1f4983054b3af019adcfeb1115ddf20bf81dfb94 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -14,9 +14,8 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/if_bridge.h>
 #include <linux/smp_lock.h>
-#include <asm/uaccess.h>
+
 #include "br_private.h"
 #include "br_private_stp.h"