---

yaml --- r: 228243 b: refs/heads/master c: f534331 h: refs/heads/master i: 228241: ea6d5f8 228239: 09d1b2e v: v3
git-mirror · Dec 1, 2010 · de27127 · de27127
1 parent 147ddd7
commit de27127
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110
+refs/heads/master: f5343314f62ba392ec069210ae342bc32c4ce367
diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h
@@ -47,12 +47,6 @@ extern void osl_assert(char *exp, char *file, int line);
 extern uint osl_pci_bus(struct osl_info *osh);
 extern uint osl_pci_slot(struct osl_info *osh);
 
-#define PKTFREESETCB(osh, _tx_fn, _tx_ctx)			\
-	do {							\
-		((struct osl_pubinfo *)osh)->tx_fn = _tx_fn;		\
-		((struct osl_pubinfo *)osh)->tx_ctx = _tx_ctx;	\
-	} while (0)
-
 #define BUS_SWAP32(v)		(v)
 
 extern void *osl_dma_alloc_consistent(struct osl_info *osh, uint size,

diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
@@ -17,15 +17,9 @@
 #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 */
 };
 
 /* osl handle type forward declaration */

diff --git a/trunk/drivers/staging/brcm80211/util/linux_osl.c b/trunk/drivers/staging/brcm80211/util/linux_osl.c
@@ -103,9 +103,6 @@ void BCMFASTPATH osl_pktfree(struct osl_info *osh, void *p, bool send)
 	skb = (struct sk_buff *)p;
 	ASSERT(skb);
 
-	if (send && osh->pub.tx_fn)
-		osh->pub.tx_fn(osh->pub.tx_ctx, p, 0);
-
 	/* perversion: we use skb->next to chain multi-skb packets */
 	while (skb) {
 		nskb = skb->next;