Skip to contentSkip to conversation

ar9170: fix beacon plcp settings

PATCH Superseded Christian Lamparter 1 participant 2 messages May 12, 2009 – Jun 1, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 ar9170: fix beacon plcp settings

This patch fixes a simple copy & paste error that affected beacon transmission in 802.11a mode.

---
This series needs testing on more broken hardware and config settings!

So please wait before merging, thanks.

Regards,
Chr
---

drivers/net/wireless/ath/ar9170/mac.c +2 -2
index 43aeb69..72c7b5d 100644
@@ -398,10 +398,10 @@ int ar9170_update_beacon(struct ar9170 *ar)
 	/* XXX: use skb->cb info */
 	if (ar->hw->conf.channel->band == IEEE80211_BAND_2GHZ)
 		ar9170_regwrite(AR9170_MAC_REG_BCN_PLCP,
-				((skb->len + 4) << (3+16)) + 0x0400);
+				((skb->len + 4) << (3 + 16)) + 0x0400);
 	else
 		ar9170_regwrite(AR9170_MAC_REG_BCN_PLCP,
-				((skb->len + 4) << (3+16)) + 0x0400);
+				((skb->len + 4) << 16) + 0x001b);
 
 	ar9170_regwrite(AR9170_MAC_REG_BCN_LENGTH, skb->len + 4);
 	ar9170_regwrite(AR9170_MAC_REG_BCN_ADDR, AR9170_BEACON_BUFFER_ADDRESS);
#1 lore raw

PATCH RESEND 1/4 ar9170: fix beacon plcp settings

This patch fixes a simple copy & paste error that affected beacon transmission in 802.11a mode.

---
meh, no complains.
---

drivers/net/wireless/ath/ar9170/mac.c +2 -2
index 43aeb69..72c7b5d 100644
@@ -398,10 +398,10 @@ int ar9170_update_beacon(struct ar9170 *ar)
 	/* XXX: use skb->cb info */
 	if (ar->hw->conf.channel->band == IEEE80211_BAND_2GHZ)
 		ar9170_regwrite(AR9170_MAC_REG_BCN_PLCP,
-				((skb->len + 4) << (3+16)) + 0x0400);
+				((skb->len + 4) << (3 + 16)) + 0x0400);
 	else
 		ar9170_regwrite(AR9170_MAC_REG_BCN_PLCP,
-				((skb->len + 4) << (3+16)) + 0x0400);
+				((skb->len + 4) << 16) + 0x001b);
 
 	ar9170_regwrite(AR9170_MAC_REG_BCN_LENGTH, skb->len + 4);
 	ar9170_regwrite(AR9170_MAC_REG_BCN_ADDR, AR9170_BEACON_BUFFER_ADDRESS);