Merge branch 'upstream-fixes'
This commit is contained in:
@@ -230,7 +230,7 @@ static int __init ieee80211_init(void)
|
||||
struct proc_dir_entry *e;
|
||||
|
||||
ieee80211_debug_level = debug;
|
||||
ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, proc_net);
|
||||
ieee80211_proc = proc_mkdir(DRV_NAME, proc_net);
|
||||
if (ieee80211_proc == NULL) {
|
||||
IEEE80211_ERROR("Unable to create " DRV_NAME
|
||||
" proc directory\n");
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user