aboutsummaryrefslogtreecommitdiff
path: root/src/transport/wlan
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/transport/wlan
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/transport/wlan')
-rw-r--r--src/transport/wlan/radiotap-parser.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/transport/wlan/radiotap-parser.c b/src/transport/wlan/radiotap-parser.c
index 51dfd7107..ab75524f2 100644
--- a/src/transport/wlan/radiotap-parser.c
+++ b/src/transport/wlan/radiotap-parser.c
@@ -62,14 +62,14 @@ ieee80211_radiotap_iterator_init (struct ieee80211_radiotap_iterator *iterator,
62 iterator->max_length = le16_to_cpu (radiotap_header->it_len); 62 iterator->max_length = le16_to_cpu (radiotap_header->it_len);
63 iterator->arg_index = 0; 63 iterator->arg_index = 0;
64 iterator->bitmap_shifter = le32_to_cpu (radiotap_header->it_present); 64 iterator->bitmap_shifter = le32_to_cpu (radiotap_header->it_present);
65 iterator->arg = ((u8 *) radiotap_header) + 65 iterator->arg =
66 sizeof (struct ieee80211_radiotap_header); 66 ((u8 *) radiotap_header) + sizeof (struct ieee80211_radiotap_header);
67 iterator->this_arg = 0; 67 iterator->this_arg = 0;
68 68
69 /* find payload start allowing for extended bitmap(s) */ 69 /* find payload start allowing for extended bitmap(s) */
70 70
71 if (unlikely (iterator->bitmap_shifter & 71 if (unlikely
72 IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK)) 72 (iterator->bitmap_shifter & IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK))
73 { 73 {
74 while (le32_to_cpu (*((u32 *) iterator->arg)) & 74 while (le32_to_cpu (*((u32 *) iterator->arg)) &
75 IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK) 75 IEEE80211_RADIOTAP_PRESENT_EXTEND_MASK)
@@ -190,13 +190,14 @@ ieee80211_radiotap_iterator_next (struct ieee80211_radiotap_iterator *iterator)
190 * kind of boundary. 190 * kind of boundary.
191 */ 191 */
192 192
193 if ((((void *) iterator->arg) - ((void *) iterator->rtheader)) & 193 if ((((void *) iterator->arg) -
194 ((rt_sizes[iterator->arg_index] >> 4) - 1)) 194 ((void *) iterator->
195 rtheader)) & ((rt_sizes[iterator->arg_index] >> 4) - 1))
195 iterator->arg_index += 196 iterator->arg_index +=
196 (rt_sizes[iterator->arg_index] >> 4) - 197 (rt_sizes[iterator->arg_index] >> 4) -
197 ((((void *) iterator->arg) - 198 ((((void *) iterator->arg) -
198 ((void *) iterator->rtheader)) & 199 ((void *) iterator->
199 ((rt_sizes[iterator->arg_index] >> 4) - 1)); 200 rtheader)) & ((rt_sizes[iterator->arg_index] >> 4) - 1));
200 201
201 /* 202 /*
202 * this is what we will return to user, but we need to 203 * this is what we will return to user, but we need to