From 6223c7b9ef285484807296574f50121008d96e59 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 16 Apr 2004 00:11:59 -0700
Subject: [PATCH] [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.
---
 include/linux/if_bridge.h | 3 ---
 net/bridge/br.c           | 3 +--
 net/bridge/br_device.c    | 1 -
 net/bridge/br_forward.c   | 2 --
 net/bridge/br_if.c        | 4 +---
 net/bridge/br_input.c     | 1 -
 net/bridge/br_ioctl.c     | 2 +-
 net/bridge/br_notify.c    | 2 +-
 net/bridge/br_stp.c       | 3 +--
 net/bridge/br_stp_bpdu.c  | 3 +--
 net/bridge/br_stp_if.c    | 3 +--
 net/bridge/br_stp_timer.c | 3 +--
 12 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 099368acb7ed8..5dff099e76b57 100644
--- 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 d4e9bc580edb2..e5f6c19236f40 100644
--- 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 6408fd1c4e110..1b8dbdd9fe1c2 100644
--- 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 00bc0e70fa17e..1589763867d0d 100644
--- 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 2f9ebbfa7b4f8..e14c19d0cd1c4 100644
--- 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 483aa63e3092a..6a69ace0fc72c 100644
--- 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 346a4fb7e1f71..03d9952a5becd 100644
--- 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 471d22180f81b..594bb5bca5d7f 100644
--- 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 b833444f9fa45..d69a2faf083e6 100644
--- 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 341a5ccb5c54f..b91a875aca01c 100644
--- 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 b6d9ddc6102cb..cb7789b0f84a4 100644
--- 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 eb106a4042fde..1f4983054b3af 100644
--- 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"
 
-- 
2.53.0