staging: brcm80211: expose osl contents and start combining osl and pub_osl.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index 0fb6e1c86793a1c628b2db79122a7c689ebc096d..1181f014a114848f54e0f660e782ce6b02bcd623 100644 (file)
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -54,19 +54,6 @@ extern void osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val);
 extern uint osl_pci_bus(osl_t *osh);
 extern uint osl_pci_slot(osl_t *osh);
 
-/* Pkttag flag should be part of public information */
-typedef struct {
-       uint pktalloced;        /* Number of allocated packet buffers */
-       bool mmbus;             /* Bus supports memory-mapped register accesses */
-       pktfree_cb_fn_t tx_fn;  /* Callback function for PKTFREE */
-       void *tx_ctx;           /* Context to the callback function */
-#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
-       osl_rreg_fn_t rreg_fn;  /* Read Register function */
-       osl_wreg_fn_t wreg_fn;  /* Write Register function */
-       void *reg_ctx;          /* Context to the reg callback functions */
-#endif
-} osl_pubinfo_t;
-
 #define PKTFREESETCB(osh, _tx_fn, _tx_ctx)                     \
        do {                                                    \
                ((osl_pubinfo_t *)osh)->tx_fn = _tx_fn;         \

diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index bcb56aa5dc96689c6a8367ab4568fbc9ad487428..0cdd15d992fae46d57bceb1726ddce1f4352685b 100644 (file)
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -17,12 +17,34 @@
 #ifndef _osl_h_
 #define _osl_h_
 
+/* Drivers use PKTFREESETCB to register a callback function
+   when a packet is freed by OSL */
+typedef void (*pktfree_cb_fn_t) (void *ctx, void *pkt, unsigned int status);
+
+struct osl_pubinfo {
+       uint pktalloced;        /* Number of allocated packet buffers */
+       bool mmbus;             /* Bus supports memory-mapped registers */
+       pktfree_cb_fn_t tx_fn;  /* Callback function for PKTFREE */
+       void *tx_ctx;           /* Context to the callback function */
+#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)
+       osl_rreg_fn_t rreg_fn;  /* Read Register function */
+       osl_wreg_fn_t wreg_fn;  /* Write Register function */
+       void *reg_ctx;          /* Context to the reg callback functions */
+#endif
+};
+
 /* osl handle type forward declaration */
+struct osl_info {
+       struct osl_pubinfo pub;
+       uint magic;
+       void *pdev;
+       uint bustype;
+};
+
 typedef struct osl_info osl_t;
+typedef struct osl_pubinfo osl_pubinfo_t;
 typedef struct osl_dmainfo osldma_t;
 
-/* Drivers use PKTFREESETCB to register a callback function when a packet is freed by OSL */
-typedef void (*pktfree_cb_fn_t) (void *ctx, void *pkt, unsigned int status);
 
 #ifdef BCMSDIO
 /* Drivers use REGOPSSET() to register register read/write funcitons */

diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index 625cbacc8665740d219b5a4645905751ee76f319..3869de75d8c8bf11b14ceae00db44a09e441f2fc 100644 (file)
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -33,13 +33,6 @@
 #define OS_HANDLE_MAGIC                0x1234abcd      /* Magic # to recognise osh */
 #define BCM_MEM_FILENAME_LEN   24      /* Mem. filename length */
 
-struct osl_info {
-       osl_pubinfo_t pub;
-       uint magic;
-       void *pdev;
-       uint bustype;
-};
-
 /* Global ASSERT type flag */
 u32 g_assert_type;