On Fri, 2011-11-18 at 17:02 +0100, Helmut Schaa wrote: > I intoduced this bug in commit a2fe81667410723d941a688e1958a49d67ca3346 > "mac80211: Build TX radiotap header dynamically" Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx> > --- > net/mac80211/status.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/mac80211/status.c b/net/mac80211/status.c > index a9da6ee..46222ce 100644 > --- a/net/mac80211/status.c > +++ b/net/mac80211/status.c > @@ -260,7 +260,7 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_supported_band > struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; > struct ieee80211_radiotap_header *rthdr; > unsigned char *pos; > - __le16 txflags; > + u16 txflags; > > rthdr = (struct ieee80211_radiotap_header *) skb_push(skb, rtap_len); > > @@ -290,13 +290,13 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_supported_band > txflags = 0; > if (!(info->flags & IEEE80211_TX_STAT_ACK) && > !is_multicast_ether_addr(hdr->addr1)) > - txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_FAIL); > + txflags |= IEEE80211_RADIOTAP_F_TX_FAIL; > > if ((info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) || > (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)) > - txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_CTS); > + txflags |= IEEE80211_RADIOTAP_F_TX_CTS; > else if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) > - txflags |= cpu_to_le16(IEEE80211_RADIOTAP_F_TX_RTS); > + txflags |= IEEE80211_RADIOTAP_F_TX_RTS; > > put_unaligned_le16(txflags, pos); > pos += 2; Heh I would've fixed it by just using put_unaligned(txflags, pos) here, but either is fine with me :-) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
