diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 11:30:02 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 11:30:02 +0200 |
| commit | d9e34325fd62310b7b49243d02b774f3ef2452db (patch) | |
| tree | d356eab72377f2576ad356de66daec23f28529a5 /net/ieee80211/ieee80211_tx.c | |
| parent | [PATCH] s390: introducing support in qeth for new OSA CHPID type OSN (diff) | |
| parent | [PATCH] sungem: fix gfp flags type (diff) | |
| download | linux-d9e34325fd62310b7b49243d02b774f3ef2452db.tar.xz linux-d9e34325fd62310b7b49243d02b774f3ef2452db.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 e860777ab8d3..4644338ac571 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, - unsigned int gfp_mask) + unsigned int __nocast gfp_mask) { struct ieee80211_txb *txb; int i; |