Skip to content

Commit

Permalink
wl1271: avoid redundant memcpy of rx_status
Browse files Browse the repository at this point in the history
copy the rx_status directly to skb->cb (control buffer) instead of copying
it to a local struct and then copying it again (for each rx packet)

Signed-off-by: Eliad Peller <eliad@wizery.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Eliad Peller authored and John W. Linville committed Sep 21, 2010
1 parent 2c7808d commit 58be460
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/wireless/wl12xx/wl1271_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ static void wl1271_rx_status(struct wl1271 *wl,

static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length)
{
struct ieee80211_rx_status rx_status;
struct wl1271_rx_descriptor *desc;
struct sk_buff *skb;
u16 *fc;
Expand Down Expand Up @@ -109,14 +108,13 @@ static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length)
if ((*fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON)
beacon = 1;

wl1271_rx_status(wl, desc, &rx_status, beacon);
wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon);

wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s", skb, skb->len,
beacon ? "beacon" : "");

skb_trim(skb, skb->len - desc->pad_len);

memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
ieee80211_rx_ni(wl->hw, skb);
}

Expand Down

0 comments on commit 58be460

Please sign in to comment.