From 6322a36c4bebfcfb50f1398aaa6bc125bbc4d494 Mon Sep 17 00:00:00 2001
From: Brett Rudley <brudley@broadcom.com>
Date: Tue, 16 Nov 2010 13:16:58 -0800
Subject: [PATCH] --- yaml --- r: 228127 b: refs/heads/master c:
 1070137de3e3b0f3fdfedc420a06a43d05a6e705 h: refs/heads/master i:   228125:
 559c8faa1e75204c498d2fe289d8d920a5c96bf6   228123:
 7181093065778410b8de90130aed0b2f80c9ef63   228119:
 de30a168a2aa26321c064726d8013e5a9e96cbaa   228111:
 86b93f820919f3f9b588e361a62d37d348326ee6   228095:
 f7e67f07c715dfde654cc506f533c52644a56709 v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/include/linux_osl.h     | 13 ----------
 trunk/drivers/staging/brcm80211/include/osl.h | 26 +++++++++++++++++--
 .../staging/brcm80211/util/linux_osl.c        |  7 -----
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index a95990d0053e..8ba3ab5a5e15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e3161390130f50fdbb4b989c667f42e5008107f
+refs/heads/master: 1070137de3e3b0f3fdfedc420a06a43d05a6e705
diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h
index 0fb6e1c86793..1181f014a114 100644
--- a/trunk/drivers/staging/brcm80211/include/linux_osl.h
+++ b/trunk/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/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
index bcb56aa5dc96..0cdd15d992fa 100644
--- a/trunk/drivers/staging/brcm80211/include/osl.h
+++ b/trunk/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/trunk/drivers/staging/brcm80211/util/linux_osl.c b/trunk/drivers/staging/brcm80211/util/linux_osl.c
index 625cbacc8665..3869de75d8c8 100644
--- a/trunk/drivers/staging/brcm80211/util/linux_osl.c
+++ b/trunk/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;