From 6d455afcc811044c026ca166eb265e4c5c8cb84b Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Mon, 24 Oct 2005 10:27:46 -0500 Subject: [PATCH] --- yaml --- r: 10359 b: refs/heads/master c: 077783f87708b24054452e5c07685ead2c28b1eb h: refs/heads/master i: 10357: a40508a38da16e62afb53e178e6ee07d55b32fa6 10355: c648b9a68be94f33750b5a28dc81877153f8b45a 10351: 2adb02bb99116b442141dadd634a9bfc2584c5ee v: v3 --- [refs] | 2 +- trunk/net/ieee80211/ieee80211_tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 220a85373d33..9ed734ff234e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac9c18974f7d08cdedfb1e9599faa8c851c7cef9 +refs/heads/master: 077783f87708b24054452e5c07685ead2c28b1eb diff --git a/trunk/net/ieee80211/ieee80211_tx.c b/trunk/net/ieee80211/ieee80211_tx.c index fb4509032402..95ccbadbf55b 100644 --- a/trunk/net/ieee80211/ieee80211_tx.c +++ b/trunk/net/ieee80211/ieee80211_tx.c @@ -541,7 +541,7 @@ int ieee80211_tx_frame(struct ieee80211_device *ieee, /* 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(1, len, GFP_ATOMIC); + txb = ieee80211_alloc_txb(1, len, ieee->tx_headroom, GFP_ATOMIC); if (unlikely(!txb)) { printk(KERN_WARNING "%s: Could not allocate TXB\n", ieee->dev->name);