On Friday 16 May 2008 21:38:23 Harvey Harrison wrote:
> diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
> index 45709ad..f899a06 100644
> --- a/net/mac80211/wpa.c
> +++ b/net/mac80211/wpa.c
> @@ -24,23 +24,21 @@ static int ieee80211_get_hdr_info(const struct sk_buff *skb, u8 **sa, u8 **da,
> {
> struct ieee80211_hdr *hdr;
> size_t hdrlen;
> - u16 fc;
> int a4_included;
> u8 *pos;
>
> hdr = (struct ieee80211_hdr *) skb->data;
> - fc = le16_to_cpu(hdr->frame_control);
>
> hdrlen = 24;
> - if ((fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) ==
> - (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
> + if (ieee80211_fctl_has_a4(hdr)) {
> hdrlen += ETH_ALEN;
> + a4_included = 1;
> *sa = hdr->addr4;
> *da = hdr->addr3;
> - } else if (fc & IEEE80211_FCTL_FROMDS) {
> + } else if (ieee80211_fctl_fromds(hdr)) {
> *sa = hdr->addr3;
> *da = hdr->addr1;
> - } else if (fc & IEEE80211_FCTL_TODS) {
> + } else if (ieee80211_fctl_tods(hdr)) {
> *sa = hdr->addr2;
> *da = hdr->addr3;
> } else {
> @@ -48,16 +46,14 @@ static int ieee80211_get_hdr_info(const struct sk_buff *skb, u8 **sa, u8 **da,
> *da = hdr->addr1;
> }
>
> - if (fc & 0x80)
> + if (ieee80211_stype(hdr, IEEE80211_STYPE_QOS_DATA))
> hdrlen += 2;
>
> *data = skb->data + hdrlen;
> *data_len = skb->len - hdrlen;
>
> - a4_included = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
^^^^^^^^^^^^^^^^^^^
> - (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);
> - if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
> - fc & IEEE80211_STYPE_QOS_DATA) {
> + if (ieee80211_ftype_data(hdr) &&
> + ieee80211_stype(hdr, IEEE80211_STYPE_QOS_DATA)) {
> pos = (u8 *) &hdr->addr4;
> if (a4_included)
Are we going to use a4_included uninitialized now?
> pos += 6;
--
Greetings Michael.
--
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
