From b9669e16dcddcad9e728b850a70482aa68b0a0c0 Mon Sep 17 00:00:00 2001 From: Vladimir Kondratiev Date: Mon, 28 Jan 2013 18:31:02 +0200 Subject: [PATCH] --- yaml --- r: 352319 b: refs/heads/master c: 241804cb7b09d05c1e79735fa51521b211f51fd1 h: refs/heads/master i: 352317: 50bf8d1d10a9f54cf4c318743a7de7b2f01c3263 352315: 0a5151801f1eb742751966c78ea3aaf0ebbd55f8 352311: 1041e010f7bbc1b142e457b1603077d94e920ef1 352303: 7bf1d5105a6c84198a938adb5e16e19139abb50b 352287: b2838b1daf8cc162ce15544df96f13cc4fddf81c 352255: 8f9982fdf3a441684b407ac383e32c34ca4877a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/wil6210/txrx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 840729d5e19d..f252bd135478 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb901733b4d6f6d1f00354f62de7df826cf1dfe8 +refs/heads/master: 241804cb7b09d05c1e79735fa51521b211f51fd1 diff --git a/trunk/drivers/net/wireless/ath/wil6210/txrx.c b/trunk/drivers/net/wireless/ath/wil6210/txrx.c index e7ea5384a614..649f50476105 100644 --- a/trunk/drivers/net/wireless/ath/wil6210/txrx.c +++ b/trunk/drivers/net/wireless/ath/wil6210/txrx.c @@ -430,6 +430,8 @@ static void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev) int rc; unsigned int len = skb->len; + skb_orphan(skb); + if (in_interrupt()) rc = netif_rx(skb); else @@ -464,8 +466,6 @@ void wil_rx_handle(struct wil6210_priv *wil) wil_hex_dump_TXRX("Rx ", DUMP_PREFIX_OFFSET, 16, 1, skb->data, skb_headlen(skb), false); - skb_orphan(skb); - if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) { skb->dev = ndev; skb_reset_mac_header(skb);