From 0f93f912b6728ff37f3ee565ca6a62a98ae57751 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Thu, 25 Aug 2011 18:10:58 +0300 Subject: [PATCH] --- yaml --- r: 266223 b: refs/heads/master c: 5c472148b0894478c427f5b1b0f69602cb103f88 h: refs/heads/master i: 266221: 024faa9ba69d704f669e1b8b84760622b4ab127b 266219: 64e9c3d06cbb7ebbf979204163607a7859caa143 266215: bf405ea117ebadd9d9321fcca9b7598ea0a2dda8 266207: 04223051a59b5f0f45d5fb0cdc78637d44faa025 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/rx.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eca8688eb68c..65fab68eb315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c91d06006dd327153d163e5299b8c92f82da86b3 +refs/heads/master: 5c472148b0894478c427f5b1b0f69602cb103f88 diff --git a/trunk/drivers/net/wireless/wl12xx/rx.c b/trunk/drivers/net/wireless/wl12xx/rx.c index 78d8410da1f4..9074625853b2 100644 --- a/trunk/drivers/net/wireless/wl12xx/rx.c +++ b/trunk/drivers/net/wireless/wl12xx/rx.c @@ -107,6 +107,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length, u8 beacon = 0; u8 is_data = 0; u8 reserved = unaligned ? NET_IP_ALIGN : 0; + u16 seq_num; /* * In PLT mode we seem to get frames and mac80211 warns about them, @@ -169,9 +170,11 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length, wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon); - wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s", skb, + seq_num = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4; + wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d", skb, skb->len - desc->pad_len, - beacon ? "beacon" : ""); + beacon ? "beacon" : "", + seq_num); skb_trim(skb, skb->len - desc->pad_len);