|
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
|
|
|
return -EINVAL;
|
|
|
|
|
|
/* sanity check for allowed length and radiotap length field */
|
|
|
- if (max_length < le16_to_cpu(get_unaligned(&radiotap_header->it_len)))
|
|
|
+ if (max_length < get_unaligned_le16(&radiotap_header->it_len))
|
|
|
return -EINVAL;
|
|
|
|
|
|
iterator->rtheader = radiotap_header;
|
|
|
- iterator->max_length = le16_to_cpu(get_unaligned(
|
|
|
- &radiotap_header->it_len));
|
|
|
+ iterator->max_length = get_unaligned_le16(&radiotap_header->it_len);
|
|
|
iterator->arg_index = 0;
|
|
|
- iterator->bitmap_shifter = le32_to_cpu(get_unaligned(
|
|
|
- &radiotap_header->it_present));
|
|
|
+ iterator->bitmap_shifter = get_unaligned_le32(&radiotap_header->it_present);
|
|
|
iterator->arg = (u8 *)radiotap_header + sizeof(*radiotap_header);
|
|
|
iterator->this_arg = NULL;
|
|
|
|
|
|
/* find payload start allowing for extended bitmap(s) */
|
|
|
|
|
|
if (unlikely(iterator->bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT))) {
|
|
|
- while (le32_to_cpu(get_unaligned((__le32 *)iterator->arg)) &
|
|
|
- (1<<IEEE80211_RADIOTAP_EXT)) {
|
|
|
+ while (get_unaligned_le32(iterator->arg) &
|
|
|
+ (1 << IEEE80211_RADIOTAP_EXT)) {
|
|
|
iterator->arg += sizeof(u32);
|
|
|
|
|
|
/*
|
|
@@ -241,8 +239,8 @@ int ieee80211_radiotap_iterator_next(
|
|
|
if (iterator->bitmap_shifter & 1) {
|
|
|
/* b31 was set, there is more */
|
|
|
/* move to next u32 bitmap */
|
|
|
- iterator->bitmap_shifter = le32_to_cpu(
|
|
|
- get_unaligned(iterator->next_bitmap));
|
|
|
+ iterator->bitmap_shifter =
|
|
|
+ get_unaligned_le32(iterator->next_bitmap);
|
|
|
iterator->next_bitmap++;
|
|
|
} else
|
|
|
/* no more bitmaps: end */
|