Commit 58be4607 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville

wl1271: avoid redundant memcpy of rx_status

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: default avatarEliad Peller <eliad@wizery.com>
Acked-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2c7808d9
...@@ -76,7 +76,6 @@ static void wl1271_rx_status(struct wl1271 *wl, ...@@ -76,7 +76,6 @@ static void wl1271_rx_status(struct wl1271 *wl,
static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length) static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length)
{ {
struct ieee80211_rx_status rx_status;
struct wl1271_rx_descriptor *desc; struct wl1271_rx_descriptor *desc;
struct sk_buff *skb; struct sk_buff *skb;
u16 *fc; u16 *fc;
...@@ -109,14 +108,13 @@ static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length) ...@@ -109,14 +108,13 @@ static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length)
if ((*fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON) if ((*fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON)
beacon = 1; 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, wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s", skb, skb->len,
beacon ? "beacon" : ""); beacon ? "beacon" : "");
skb_trim(skb, skb->len - desc->pad_len); skb_trim(skb, skb->len - desc->pad_len);
memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));
ieee80211_rx_ni(wl->hw, skb); ieee80211_rx_ni(wl->hw, skb);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment