diff options
author | Zhao, Gang <gamerh2o@gmail.com> | 2014-04-21 00:52:59 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-25 11:30:28 -0400 |
commit | 6b59db7d4c4b0ad039a10b63b48e4a7ff3655902 (patch) | |
tree | 8c603b0b8709e3eb582e38058a47331e348dcb08 /net/mac80211/rx.c | |
parent | 17d38fa8c20a9c3ec76943da46264ce657ac56d0 (diff) |
mac80211: return bool instead of numbers in yes/no function
And some code style changes in the function, and correct a typo in
comment.
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 216c45b949e5..0e5b67015650 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -54,24 +54,25 @@ static struct sk_buff *remove_monitor_info(struct ieee80211_local *local, | |||
54 | return skb; | 54 | return skb; |
55 | } | 55 | } |
56 | 56 | ||
57 | static inline int should_drop_frame(struct sk_buff *skb, int present_fcs_len) | 57 | static inline bool should_drop_frame(struct sk_buff *skb, int present_fcs_len) |
58 | { | 58 | { |
59 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); | 59 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); |
60 | struct ieee80211_hdr *hdr; | 60 | struct ieee80211_hdr *hdr = (void *)skb->data; |
61 | |||
62 | hdr = (void *)(skb->data); | ||
63 | 61 | ||
64 | if (status->flag & (RX_FLAG_FAILED_FCS_CRC | | 62 | if (status->flag & (RX_FLAG_FAILED_FCS_CRC | |
65 | RX_FLAG_FAILED_PLCP_CRC | | 63 | RX_FLAG_FAILED_PLCP_CRC | |
66 | RX_FLAG_AMPDU_IS_ZEROLEN)) | 64 | RX_FLAG_AMPDU_IS_ZEROLEN)) |
67 | return 1; | 65 | return true; |
66 | |||
68 | if (unlikely(skb->len < 16 + present_fcs_len)) | 67 | if (unlikely(skb->len < 16 + present_fcs_len)) |
69 | return 1; | 68 | return true; |
69 | |||
70 | if (ieee80211_is_ctl(hdr->frame_control) && | 70 | if (ieee80211_is_ctl(hdr->frame_control) && |
71 | !ieee80211_is_pspoll(hdr->frame_control) && | 71 | !ieee80211_is_pspoll(hdr->frame_control) && |
72 | !ieee80211_is_back_req(hdr->frame_control)) | 72 | !ieee80211_is_back_req(hdr->frame_control)) |
73 | return 1; | 73 | return true; |
74 | return 0; | 74 | |
75 | return false; | ||
75 | } | 76 | } |
76 | 77 | ||
77 | static int | 78 | static int |
@@ -3190,7 +3191,7 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx, | |||
3190 | } | 3191 | } |
3191 | 3192 | ||
3192 | /* | 3193 | /* |
3193 | * This is the actual Rx frames handler. as it blongs to Rx path it must | 3194 | * This is the actual Rx frames handler. as it belongs to Rx path it must |
3194 | * be called with rcu_read_lock protection. | 3195 | * be called with rcu_read_lock protection. |
3195 | */ | 3196 | */ |
3196 | static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, | 3197 | static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, |