Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266223
b: refs/heads/master
c: 5c47214
h: refs/heads/master
i:
  266221: 024faa9
  266219: 64e9c3d
  266215: bf405ea
  266207: 0422305
v: v3
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Sep 14, 2011
1 parent 3818c51 commit 0f93f91
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c91d06006dd327153d163e5299b8c92f82da86b3
refs/heads/master: 5c472148b0894478c427f5b1b0f69602cb103f88
7 changes: 5 additions & 2 deletions trunk/drivers/net/wireless/wl12xx/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 0f93f91

Please sign in to comment.