diff options
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 39aaf210e9f5..af6ce1064697 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -26,10 +26,11 @@ | |||
26 | #include "tkip.h" | 26 | #include "tkip.h" |
27 | #include "wme.h" | 27 | #include "wme.h" |
28 | 28 | ||
29 | u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | 29 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, |
30 | struct tid_ampdu_rx *tid_agg_rx, | 30 | struct tid_ampdu_rx *tid_agg_rx, |
31 | struct sk_buff *skb, u16 mpdu_seq_num, | 31 | struct sk_buff *skb, |
32 | int bar_req); | 32 | u16 mpdu_seq_num, |
33 | int bar_req); | ||
33 | /* | 34 | /* |
34 | * monitor mode reception | 35 | * monitor mode reception |
35 | * | 36 | * |
@@ -1988,17 +1989,17 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, | |||
1988 | 1989 | ||
1989 | static inline int seq_less(u16 sq1, u16 sq2) | 1990 | static inline int seq_less(u16 sq1, u16 sq2) |
1990 | { | 1991 | { |
1991 | return (((sq1 - sq2) & SEQ_MASK) > (SEQ_MODULO >> 1)); | 1992 | return ((sq1 - sq2) & SEQ_MASK) > (SEQ_MODULO >> 1); |
1992 | } | 1993 | } |
1993 | 1994 | ||
1994 | static inline u16 seq_inc(u16 sq) | 1995 | static inline u16 seq_inc(u16 sq) |
1995 | { | 1996 | { |
1996 | return ((sq + 1) & SEQ_MASK); | 1997 | return (sq + 1) & SEQ_MASK; |
1997 | } | 1998 | } |
1998 | 1999 | ||
1999 | static inline u16 seq_sub(u16 sq1, u16 sq2) | 2000 | static inline u16 seq_sub(u16 sq1, u16 sq2) |
2000 | { | 2001 | { |
2001 | return ((sq1 - sq2) & SEQ_MASK); | 2002 | return (sq1 - sq2) & SEQ_MASK; |
2002 | } | 2003 | } |
2003 | 2004 | ||
2004 | 2005 | ||
@@ -2006,10 +2007,11 @@ static inline u16 seq_sub(u16 sq1, u16 sq2) | |||
2006 | * As it function blongs to Rx path it must be called with | 2007 | * As it function blongs to Rx path it must be called with |
2007 | * the proper rcu_read_lock protection for its flow. | 2008 | * the proper rcu_read_lock protection for its flow. |
2008 | */ | 2009 | */ |
2009 | u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, | 2010 | static u8 ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw, |
2010 | struct tid_ampdu_rx *tid_agg_rx, | 2011 | struct tid_ampdu_rx *tid_agg_rx, |
2011 | struct sk_buff *skb, u16 mpdu_seq_num, | 2012 | struct sk_buff *skb, |
2012 | int bar_req) | 2013 | u16 mpdu_seq_num, |
2014 | int bar_req) | ||
2013 | { | 2015 | { |
2014 | struct ieee80211_local *local = hw_to_local(hw); | 2016 | struct ieee80211_local *local = hw_to_local(hw); |
2015 | struct ieee80211_rx_status status; | 2017 | struct ieee80211_rx_status status; |