From c648b9a68be94f33750b5a28dc81877153f8b45a Mon Sep 17 00:00:00 2001
From: Michael Buesch <mbuesch@freenet.de>
Date: Fri, 21 Oct 2005 12:39:52 -0500
Subject: [PATCH] --- yaml --- r: 10355 b: refs/heads/master c:
 d3f7bf4fa9626d371f26cd310477202628a8126a h: refs/heads/master i:   10353:
 b69e331af56fdf39261c213c7030c1e2f730359a   10351:
 2adb02bb99116b442141dadd634a9bfc2584c5ee v: v3

---
 [refs]                             | 2 +-
 trunk/net/ieee80211/ieee80211_tx.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 40b8ac8838bf..ca8a24db42ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0f15ab5542f73d07e35eeee713df289599427b2
+refs/heads/master: d3f7bf4fa9626d371f26cd310477202628a8126a
diff --git a/trunk/net/ieee80211/ieee80211_tx.c b/trunk/net/ieee80211/ieee80211_tx.c
index f4f2a33973a7..fb4509032402 100644
--- a/trunk/net/ieee80211/ieee80211_tx.c
+++ b/trunk/net/ieee80211/ieee80211_tx.c
@@ -190,7 +190,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb)
 }
 
 static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
-						 gfp_t gfp_mask)
+						 int headroom, gfp_t gfp_mask)
 {
 	struct ieee80211_txb *txb;
 	int i;
@@ -204,11 +204,13 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
 	txb->frag_size = txb_size;
 
 	for (i = 0; i < nr_frags; i++) {
-		txb->fragments[i] = dev_alloc_skb(txb_size);
+		txb->fragments[i] = __dev_alloc_skb(txb_size + headroom,
+						    gfp_mask);
 		if (unlikely(!txb->fragments[i])) {
 			i--;
 			break;
 		}
+		skb_reserve(txb->fragments[i], headroom);
 	}
 	if (unlikely(i != nr_frags)) {
 		while (i >= 0)
@@ -384,7 +386,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* When we allocate the TXB we allocate enough space for the reserve
 	 * and full fragment bytes (bytes_per_frag doesn't include prefix,
 	 * postfix, header, FCS, etc.) */
-	txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
+	txb = ieee80211_alloc_txb(nr_frags, frag_size,
+				  ieee->tx_headroom, GFP_ATOMIC);
 	if (unlikely(!txb)) {
 		printk(KERN_WARNING "%s: Could not allocate TXB\n",
 		       ieee->dev->name);