Skip to content

Commit

Permalink
mac80211: return bool instead of numbers in yes/no function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhao, Gang authored and Johannes Berg committed Apr 25, 2014
1 parent 17d38fa commit 6b59db7
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,25 @@ static struct sk_buff *remove_monitor_info(struct ieee80211_local *local,
return skb;
}

static inline int should_drop_frame(struct sk_buff *skb, int present_fcs_len)
static inline bool should_drop_frame(struct sk_buff *skb, int present_fcs_len)
{
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_hdr *hdr;

hdr = (void *)(skb->data);
struct ieee80211_hdr *hdr = (void *)skb->data;

if (status->flag & (RX_FLAG_FAILED_FCS_CRC |
RX_FLAG_FAILED_PLCP_CRC |
RX_FLAG_AMPDU_IS_ZEROLEN))
return 1;
return true;

if (unlikely(skb->len < 16 + present_fcs_len))
return 1;
return true;

if (ieee80211_is_ctl(hdr->frame_control) &&
!ieee80211_is_pspoll(hdr->frame_control) &&
!ieee80211_is_back_req(hdr->frame_control))
return 1;
return 0;
return true;

return false;
}

static int
Expand Down Expand Up @@ -3190,7 +3191,7 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
}

/*
* This is the actual Rx frames handler. as it blongs to Rx path it must
* This is the actual Rx frames handler. as it belongs to Rx path it must
* be called with rcu_read_lock protection.
*/
static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
Expand Down

0 comments on commit 6b59db7

Please sign in to comment.