diff --git a/[refs] b/[refs]
index faa2ba73c27a..4c93e7fbcf8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6677eaa335680f75fdc3aa1dae7557f1ed446491
+refs/heads/master: cf60191a2d527065348bb315b1d650a086dde94b
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index a25b9d921555..4515f17da41a 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -5824,7 +5824,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
 
 	/* add Broadcom tx descriptor header */
 	txh = (d11txh_t *) skb_push(p, D11_TXH_LEN);
-	memset((char *)txh, 0, D11_TXH_LEN);
+	memset(txh, 0, D11_TXH_LEN);
 
 	/* setup frameid */
 	if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {