Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae7245cb authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

wireless: use get/put_unaligned_* helpers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5a433b3a

net/mac80211/mesh_hwmp.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static inline u32 u32_field_get(u8 *preq_elem, int offset, bool ae) 
{

	if (ae)

		offset += 6;

	return le32_to_cpu(get_unaligned((__le32 *) (preq_elem + offset)));

	return get_unaligned_le32(preq_elem + offset);

}



/* HWMP IE processing macros */

net/wireless/radiotap.c

+7 −9
Original line number Diff line number Diff line
@@ -59,22 +59,20 @@ 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)) &

		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 */