aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-10-24 11:27:46 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-26 00:54:23 -0400
commit077783f87708b24054452e5c07685ead2c28b1eb (patch)
tree998c73ed67ac6a209541941cdde4df20e9f12747 /net
parentac9c18974f7d08cdedfb1e9599faa8c851c7cef9 (diff)
[PATCH] ieee80211 build fix
James Ketrenos wrote: > [3/4] Use the tx_headroom and reserve requested space. This patch introduced a compile problem; patch below corrects this. Fixed compilation error due to not passing tx_headroom in ieee80211_tx_frame. Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/ieee80211_tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index fb4509032402..95ccbadbf55b 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -541,7 +541,7 @@ int ieee80211_tx_frame(struct ieee80211_device *ieee,
541 /* When we allocate the TXB we allocate enough space for the reserve 541 /* When we allocate the TXB we allocate enough space for the reserve
542 * and full fragment bytes (bytes_per_frag doesn't include prefix, 542 * and full fragment bytes (bytes_per_frag doesn't include prefix,
543 * postfix, header, FCS, etc.) */ 543 * postfix, header, FCS, etc.) */
544 txb = ieee80211_alloc_txb(1, len, GFP_ATOMIC); 544 txb = ieee80211_alloc_txb(1, len, ieee->tx_headroom, GFP_ATOMIC);
545 if (unlikely(!txb)) { 545 if (unlikely(!txb)) {
546 printk(KERN_WARNING "%s: Could not allocate TXB\n", 546 printk(KERN_WARNING "%s: Could not allocate TXB\n",
547 ieee->dev->name); 547 ieee->dev->name);