diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2015-10-14 18:27:07 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-10-14 18:27:07 +0200 |
| commit | a732fa700133f864c542b335e80a845fe1b80f2b (patch) | |
| tree | 85aa26ba76857285e226a4a8577611f55bdbec94 /net/mac80211 | |
| parent | mac80211: remove PM-QoS listener (diff) | |
| download | linux-dev-a732fa700133f864c542b335e80a845fe1b80f2b.tar.xz linux-dev-a732fa700133f864c542b335e80a845fe1b80f2b.zip | |
mac80211: clean up ieee80211_rx_h_check_dup code
Reduce indentation a bit to make the condition more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5bc0b88d9eb1..60692d964380 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1113,16 +1113,16 @@ ieee80211_rx_h_check_dup(struct ieee80211_rx_data *rx) is_multicast_ether_addr(hdr->addr1)) return RX_CONTINUE; - if (rx->sta) { - if (unlikely(ieee80211_has_retry(hdr->frame_control) && - rx->sta->last_seq_ctrl[rx->seqno_idx] == - hdr->seq_ctrl)) { - I802_DEBUG_INC(rx->local->dot11FrameDuplicateCount); - rx->sta->num_duplicates++; - return RX_DROP_UNUSABLE; - } else if (!(status->flag & RX_FLAG_AMSDU_MORE)) { - rx->sta->last_seq_ctrl[rx->seqno_idx] = hdr->seq_ctrl; - } + if (!rx->sta) + return RX_CONTINUE; + + if (unlikely(ieee80211_has_retry(hdr->frame_control) && + rx->sta->last_seq_ctrl[rx->seqno_idx] == hdr->seq_ctrl)) { + I802_DEBUG_INC(rx->local->dot11FrameDuplicateCount); + rx->sta->num_duplicates++; + return RX_DROP_UNUSABLE; + } else if (!(status->flag & RX_FLAG_AMSDU_MORE)) { + rx->sta->last_seq_ctrl[rx->seqno_idx] = hdr->seq_ctrl; } return RX_CONTINUE; |