diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /net/ieee80211/ieee80211_tx.c | |
| parent | [PATCH] hostap: Unregister netdevs before freeing local data (diff) | |
| parent | [PATCH] s390: qeth driver fixes (diff) | |
| download | linux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz linux-3c8c7b2f32c52b259daa7564fefd582146799b23.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 8d87897d7eb7..e860777ab8d3 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -187,7 +187,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb) } static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, - int gfp_mask) + unsigned int gfp_mask) { struct ieee80211_txb *txb; int i; |