summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_tx.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 05:30:02 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 05:30:02 -0400
commitd9e34325fd62310b7b49243d02b774f3ef2452db (patch)
treed356eab72377f2576ad356de66daec23f28529a5 /net/ieee80211/ieee80211_tx.c
parent500f83abdc83d6bd472f3d103a9a9cd85df29a29 (diff)
parent832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff)
downloadop-kernel-dev-d9e34325fd62310b7b49243d02b774f3ef2452db.zip
op-kernel-dev-d9e34325fd62310b7b49243d02b774f3ef2452db.tar.gz
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
-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 e860777..4644338 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;
OpenPOWER on IntegriCloud