staging: brcm80211: remove include file proto/802.1d.h

Aim to reduce the number of source and include files. This
include file is not used anymore and can be removed.
Reviewed-by: NRoland Vossen <rvossen@broadcom.com>
Reviewed-by: NBrett Rudley <brudley@broadcom.com>
Signed-off-by: NArend van Spriel <arend@broadcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

@@ -43,7 +43,6 @@
 #include <sbsdpcmdev.h>
 #include <bcmsdpcm.h>
 
-#include <proto/802.1d.h>
 #include <proto/802.11.h>
 
 #include <dngl_stats.h>
@@ -143,6 +142,14 @@
  */
 #define PKTFREE2()		if ((bus->bus != SPI_BUS) || bus->usebufpool) \
 							pkt_buf_free_skb(bus->dhd->osh, pkt, false);
+
+/*
+ * Conversion of 802.1D priority to precedence level
+ */
+#define PRIO2PREC(prio) \
+	(((prio) == PRIO_8021D_NONE || (prio) == PRIO_8021D_BE) ? \
+	((prio^2)) : (prio))
+
 DHD_SPINWAIT_SLEEP_INIT(sdioh_spinwait_sleep);
 extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf,
 			    uint len);

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

@@ -26,9 +26,10 @@
 #include <linux/firmware.h>
 #include <net/mac80211.h>
 
-#include <proto/802.1d.h>
-#include <bcmdefs.h>
+#include <proto/802.11.h>
 #include <osl.h>
+#include <bcmdefs.h>
+#include <bcmwifi.h>
 #include <bcmutils.h>
 #include <pcicfg.h>
 #include <wlioctl.h>

drivers/staging/brcm80211/brcmsmac/wlc_alloc.c

@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <net/mac80211.h>
 
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_antsel.c

@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

@@ -22,7 +22,6 @@
 #include <linux/etherdevice.h>
 
 #include <proto/802.11.h>
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>

drivers/staging/brcm80211/brcmsmac/wlc_channel.c

@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c

@@ -18,7 +18,6 @@
 #include <linux/etherdevice.h>
 #include <net/mac80211.h>
 
-#include <proto/802.1d.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <osl.h>
@@ -71,6 +70,12 @@
 #define WPA_CAP_4_REPLAY_CNTRS		RSN_CAP_4_REPLAY_CNTRS
 #define WPA_CAP_16_REPLAY_CNTRS		RSN_CAP_16_REPLAY_CNTRS
 
+/*
+ * Indication for txflowcontrol that all priority bits in
+ * TXQ_STOP_FOR_PRIOFC_MASK are to be considered.
+ */
+#define ALLPRIO		-1
+
 /*
  * buffer length needed for wlc_format_ssid
  * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.

drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c

@@ -26,7 +26,6 @@
 #include <linux/pci.h>
 
 #include <proto/802.11.h>
-#include <proto/802.1d.h>
 #include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_rate.c

@@ -17,7 +17,6 @@
 #include <linux/module.h>
 
 #include <proto/802.11.h>
-#include <proto/802.1d.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>

drivers/staging/brcm80211/brcmsmac/wlc_stf.c

@@ -18,7 +18,6 @@
 #include <linux/module.h>
 
 #include <proto/802.11.h>
-#include <proto/802.1d.h>
 
 #include <bcmdefs.h>
 #include <osl.h>

drivers/staging/brcm80211/include/bcmdefs.h

@@ -138,6 +138,20 @@ typedef struct {
 		(((val) & (~(field ## _M << field ## _S))) | \
 		 ((unsigned)(bits) << field ## _S))
 
+/*
+ * Priority definitions according 802.1D
+ */
+#define	PRIO_8021D_NONE		2
+#define	PRIO_8021D_BK		1
+#define	PRIO_8021D_BE		0
+#define	PRIO_8021D_EE		3
+#define	PRIO_8021D_CL		4
+#define	PRIO_8021D_VI		5
+#define	PRIO_8021D_VO		6
+#define	PRIO_8021D_NC		7
+#define	MAXPRIO			7
+#define NUMPRIO			(MAXPRIO + 1)
+
 /* Max. nvram variable table size */
 #define	MAXSZ_NVRAM_VARS	4096
 

drivers/staging/brcm80211/include/proto/802.1d.h

-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _802_1_D_
-#define _802_1_D_
-
-#define	PRIO_8021D_NONE		2
-#define	PRIO_8021D_BK		1
-#define	PRIO_8021D_BE		0
-#define	PRIO_8021D_EE		3
-#define	PRIO_8021D_CL		4
-#define	PRIO_8021D_VI		5
-#define	PRIO_8021D_VO		6
-#define	PRIO_8021D_NC		7
-#define	MAXPRIO			7
-#define NUMPRIO			(MAXPRIO + 1)
-
-#define ALLPRIO		-1
-
-#define PRIO2PREC(prio) \
-	(((prio) == PRIO_8021D_NONE || (prio) == PRIO_8021D_BE) ? \
-	((prio^2)) : (prio))
-
-#endif				/* _802_1_D_ */

drivers/staging/brcm80211/util/bcmutils.c

@@ -27,7 +27,6 @@
 #include <siutils.h>
 #include <bcmnvram.h>
 #include <bcmdevs.h>
-#include <proto/802.1d.h>
 #include <proto/802.11.h>
 
 struct sk_buff *BCMFASTPATH pkt_buf_get_skb(struct osl_info *osh, uint len)