Skip to content

Commit

Permalink
[PATCH] ieee80211: Drop and count duplicate data frames to remove 're…
Browse files Browse the repository at this point in the history
…play detected' log messages

In the SoftMAC version of the IEEE 802.11 stack, not all duplicate messages are
detected. For the most part, there is no difficulty; however for TKIP and CCMP
encryption, the duplicates result in a "replay detected" log message where the
received and previous values of the TSC are identical. This change adds a new
variable to the ieee80211_device structure that holds the 'seq_ctl' value for
the previous frame. When a new frame repeats the value, the frame is dropped and
the appropriate counter is incremented.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and Jeff Garzik committed Dec 2, 2006
1 parent 42a4cf9 commit 837925d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/net/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,8 @@ struct ieee80211_device {
int perfect_rssi;
int worst_rssi;

u16 prev_seq_ctl; /* used to drop duplicate frames */

/* Callback functions */
void (*set_security) (struct net_device * dev,
struct ieee80211_security * sec);
Expand Down
5 changes: 5 additions & 0 deletions net/ieee80211/ieee80211_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
goto rx_exit;
}
#endif
/* drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.29) */
if (sc == ieee->prev_seq_ctl)
goto rx_dropped;
else
ieee->prev_seq_ctl = sc;

/* Data frame - extract src/dst addresses */
if (skb->len < IEEE80211_3ADDR_LEN)
Expand Down

0 comments on commit 837925d

Please sign in to comment.