diff options
author | Johannes Berg <johannes.berg@intel.com> | 2016-03-31 13:02:04 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-04-06 07:18:14 -0400 |
commit | 8ebaa5b0a791631dddbb3a215b342fabb2a5307b (patch) | |
tree | cbd215d20d6be65e3f855a24a87f96af6e349c49 /net/mac80211 | |
parent | de8f18d3a80bee94ee8a2d3c511707390dad88d6 (diff) |
mac80211: move semicolon out of CALL_RXH macro
Move the semicolon, people typically assume that and
once line already put a semicolon behind the "call".
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/rx.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index a94d314d0055..570ae3d03ae1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -3201,7 +3201,7 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx, | |||
3201 | res = rxh(rx); \ | 3201 | res = rxh(rx); \ |
3202 | if (res != RX_CONTINUE) \ | 3202 | if (res != RX_CONTINUE) \ |
3203 | goto rxh_next; \ | 3203 | goto rxh_next; \ |
3204 | } while (0); | 3204 | } while (0) |
3205 | 3205 | ||
3206 | /* Lock here to avoid hitting all of the data used in the RX | 3206 | /* Lock here to avoid hitting all of the data used in the RX |
3207 | * path (e.g. key data, station data, ...) concurrently when | 3207 | * path (e.g. key data, station data, ...) concurrently when |
@@ -3219,30 +3219,30 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx, | |||
3219 | */ | 3219 | */ |
3220 | rx->skb = skb; | 3220 | rx->skb = skb; |
3221 | 3221 | ||
3222 | CALL_RXH(ieee80211_rx_h_check_more_data) | 3222 | CALL_RXH(ieee80211_rx_h_check_more_data); |
3223 | CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll) | 3223 | CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll); |
3224 | CALL_RXH(ieee80211_rx_h_sta_process) | 3224 | CALL_RXH(ieee80211_rx_h_sta_process); |
3225 | CALL_RXH(ieee80211_rx_h_decrypt) | 3225 | CALL_RXH(ieee80211_rx_h_decrypt); |
3226 | CALL_RXH(ieee80211_rx_h_defragment) | 3226 | CALL_RXH(ieee80211_rx_h_defragment); |
3227 | CALL_RXH(ieee80211_rx_h_michael_mic_verify) | 3227 | CALL_RXH(ieee80211_rx_h_michael_mic_verify); |
3228 | /* must be after MMIC verify so header is counted in MPDU mic */ | 3228 | /* must be after MMIC verify so header is counted in MPDU mic */ |
3229 | #ifdef CONFIG_MAC80211_MESH | 3229 | #ifdef CONFIG_MAC80211_MESH |
3230 | if (ieee80211_vif_is_mesh(&rx->sdata->vif)) | 3230 | if (ieee80211_vif_is_mesh(&rx->sdata->vif)) |
3231 | CALL_RXH(ieee80211_rx_h_mesh_fwding); | 3231 | CALL_RXH(ieee80211_rx_h_mesh_fwding); |
3232 | #endif | 3232 | #endif |
3233 | CALL_RXH(ieee80211_rx_h_amsdu) | 3233 | CALL_RXH(ieee80211_rx_h_amsdu); |
3234 | CALL_RXH(ieee80211_rx_h_data) | 3234 | CALL_RXH(ieee80211_rx_h_data); |
3235 | 3235 | ||
3236 | /* special treatment -- needs the queue */ | 3236 | /* special treatment -- needs the queue */ |
3237 | res = ieee80211_rx_h_ctrl(rx, frames); | 3237 | res = ieee80211_rx_h_ctrl(rx, frames); |
3238 | if (res != RX_CONTINUE) | 3238 | if (res != RX_CONTINUE) |
3239 | goto rxh_next; | 3239 | goto rxh_next; |
3240 | 3240 | ||
3241 | CALL_RXH(ieee80211_rx_h_mgmt_check) | 3241 | CALL_RXH(ieee80211_rx_h_mgmt_check); |
3242 | CALL_RXH(ieee80211_rx_h_action) | 3242 | CALL_RXH(ieee80211_rx_h_action); |
3243 | CALL_RXH(ieee80211_rx_h_userspace_mgmt) | 3243 | CALL_RXH(ieee80211_rx_h_userspace_mgmt); |
3244 | CALL_RXH(ieee80211_rx_h_action_return) | 3244 | CALL_RXH(ieee80211_rx_h_action_return); |
3245 | CALL_RXH(ieee80211_rx_h_mgmt) | 3245 | CALL_RXH(ieee80211_rx_h_mgmt); |
3246 | 3246 | ||
3247 | rxh_next: | 3247 | rxh_next: |
3248 | ieee80211_rx_handlers_result(rx, res); | 3248 | ieee80211_rx_handlers_result(rx, res); |
@@ -3265,10 +3265,10 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_rx_data *rx) | |||
3265 | res = rxh(rx); \ | 3265 | res = rxh(rx); \ |
3266 | if (res != RX_CONTINUE) \ | 3266 | if (res != RX_CONTINUE) \ |
3267 | goto rxh_next; \ | 3267 | goto rxh_next; \ |
3268 | } while (0); | 3268 | } while (0) |
3269 | 3269 | ||
3270 | CALL_RXH(ieee80211_rx_h_check_dup) | 3270 | CALL_RXH(ieee80211_rx_h_check_dup); |
3271 | CALL_RXH(ieee80211_rx_h_check) | 3271 | CALL_RXH(ieee80211_rx_h_check); |
3272 | 3272 | ||
3273 | ieee80211_rx_reorder_ampdu(rx, &reorder_release); | 3273 | ieee80211_rx_reorder_ampdu(rx, &reorder_release); |
3274 | 3274 | ||