staging: brcm80211: remove include file proto/802.1d.h
authorArend van Spriel <arend@broadcom.com>
Fri, 25 Feb 2011 15:39:17 +0000 (16:39 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Mar 2011 02:17:40 +0000 (18:17 -0800)
Aim to reduce the number of source and include files. This
include file is not used anymore and can be removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14 files changed:
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
drivers/staging/brcm80211/brcmsmac/wlc_channel.c
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
drivers/staging/brcm80211/brcmsmac/wlc_rate.c
drivers/staging/brcm80211/brcmsmac/wlc_stf.c
drivers/staging/brcm80211/include/bcmdefs.h
drivers/staging/brcm80211/include/proto/802.1d.h [deleted file]
drivers/staging/brcm80211/util/bcmutils.c

index 097844f8569a6c405a8516476e0afb8297921cf1..4c10fd6e447fc90a3b51b72af9115b897a507189 100644 (file)
@@ -43,7 +43,6 @@
 #include <sbsdpcmdev.h>
 #include <bcmsdpcm.h>
 
-#include <proto/802.1d.h>
 #include <proto/802.11.h>
 
 #include <dngl_stats.h>
  */
 #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);
index ea4981e4e3fd1653771b7aa18a7718deb5b95010..b57c3a0046123f4a7f7841d11f5838fa07f15551 100644 (file)
 #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>
index 8e4908b3ecf36f4674bb791252667176a15138e8..ff5516946ae152e5471135a4dd2b7302e232b268 100644 (file)
@@ -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>
index a6572db522b4adc18e195da275c1b9aebd3f4b5f..ea6bb85d2c4b22adc17e420ea7ddb10c856fca2b 100644 (file)
@@ -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>
index a5f2508367e83c4e003f541898d071f34e27a091..ec99420c9b955bdbd4714a8fce9220cf7c1b1adf 100644 (file)
@@ -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>
index f450c55735a07c712948c8e2fc99b60dc8e94b08..b55ab25b1ed273fee883268f8708d9622ac1f2e9 100644 (file)
@@ -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>
index edfc392d75ab1d8a2bd09a81cf6a0adb5043470a..c89ce5fede2455a7632adf27ccfeb58d977aa6db 100644 (file)
@@ -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>
index 4ae75a344592d56739f8357aa58c23e741ea9056..c7f0630f020202310eb860c0768c3d2afcc29a9a 100644 (file)
@@ -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>
 #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.
index ff595ab11739f5f72bf0a8f7956b8d710824ac48..0b25bd767d53098f6c08ca023db46c03c593f1ad 100644 (file)
@@ -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>
index a8e30016a655d8cd9f721a3914fdb0b4f64c04ee..e22ff84ba678c52d15d9effa5fe7595a8469fa83 100644 (file)
@@ -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>
index 6574fb4d693742b84fff424d3b3c1b3ccaf97e63..2d98f0d69a928f6fec181f2b87e342496c6f0e8d 100644 (file)
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 
 #include <proto/802.11.h>
-#include <proto/802.1d.h>
 
 #include <bcmdefs.h>
 #include <osl.h>
index 74601fc971c92028780387e8d0fee747e5c7d54d..601ec706878c51e02006862c33461d8de27700a7 100644 (file)
@@ -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
 
diff --git a/drivers/staging/brcm80211/include/proto/802.1d.h b/drivers/staging/brcm80211/include/proto/802.1d.h
deleted file mode 100644 (file)
index 9802d87..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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_ */
index 696220edb0bc1c95a532eff55399b8ee09e4d4f2..670cde1421a3ac51669cca2f1f0bed4bf40d93ad 100644 (file)
@@ -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)