summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_tx.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-14 03:22:27 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-10-14 03:22:27 +0200
commit59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch)
treeb337d73229a69e399d4e4f7128b33ce734660e35 /net/ieee80211/ieee80211_tx.c
parentMerge branch 'master' (diff)
parent[TCP]: Ratelimit debugging warning. (diff)
downloadlinux-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.xz
linux-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.zip
Merge branch 'master'
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 4644338ac571..42c50619aa8e 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 __nocast gfp_mask)
+ gfp_t gfp_mask)
{
struct ieee80211_txb *txb;
int i;