OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieee80211 subsystem: 

* Use GFP mask on TX skb allocation.
* Use the tx_headroom and reserve requested space.

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
This commit is contained in:
Michael Buesch 2005-10-21 12:39:52 -05:00 committed by James Ketrenos
parent f0f15ab554
commit d3f7bf4fa9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ieee80211/ieee80211_tx.c
View File

@ -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, 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; struct ieee80211_txb *txb;
int i; int i;
@ -204,11 +204,13 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
txb->frag_size = txb_size; txb->frag_size = txb_size;
for (i = 0; i < nr_frags; i++) { 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])) { if (unlikely(!txb->fragments[i])) {
i--; i--;
break; break;
} }
skb_reserve(txb->fragments[i], headroom);
} }
if (unlikely(i != nr_frags)) { if (unlikely(i != nr_frags)) {
while (i >= 0) 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 /* When we allocate the TXB we allocate enough space for the reserve
* and full fragment bytes (bytes_per_frag doesn't include prefix, * and full fragment bytes (bytes_per_frag doesn't include prefix,
* postfix, header, FCS, etc.) */ * 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)) { if (unlikely(!txb)) {
printk(KERN_WARNING "%s: Could not allocate TXB\n", printk(KERN_WARNING "%s: Could not allocate TXB\n",
ieee->dev->name); ieee->dev->name);