summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-10-07 12:55:40 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 20:41:21 (GMT)
commitd5294971f11fc2b150437e43a4057c867c2bf413 (patch)
tree34acbba5d71e15793a8e179edc2478c144b08706 /net
parent72267e5cfefb2b54b6a16e5775da01e26ede2953 (diff)
downloadlinux-d5294971f11fc2b150437e43a4057c867c2bf413.tar.xz
mac80211: dont orphan TX skb
This was another workaround for truesize "bugs". The reason we did this was that when we orphaned the SKB it wouldn't be truesize-checked later. Now that the check is gone (and we just charge the former smaller size to the socket) there's no longer a reason to orphan the skb here. Keep the skb charged to the socket until it is really freed (or orphaned in TX status). This helps flow control and allows us to get at the socket later for other purposes. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 6792f52..97ac2c4 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1384,11 +1384,6 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata,
tail_need = max_t(int, tail_need, 0);
}
- if (head_need || tail_need) {
- /* Sorry. Can't account for this any more */
- skb_orphan(skb);
- }
-
if (skb_cloned(skb))
I802_DEBUG_INC(local->tx_expand_skb_head_cloned);
else if (head_need || tail_need)