Merge branch 'upstream-fixes'

[linux-2.6-omap-h63xx.git] / net / ieee80211 / ieee80211_tx.c

diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 8d87897d7eb7ef218d483a90bb64606cdc557e91..e860777ab8d34cd4fa37cebfca694f40db1ac02f 100644 (file)
--- 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;