diff options
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ccff2b6ef958..85df22f05c38 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -69,7 +69,7 @@   */  #include <linux/uaccess.h> -#include <linux/bitops.h> +#include <linux/bitmap.h>  #include <linux/capability.h>  #include <linux/cpu.h>  #include <linux/types.h> @@ -1080,7 +1080,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)  			return -EINVAL;  		/* Use one page as a bit array of possible slots */ -		inuse = (unsigned long *) get_zeroed_page(GFP_ATOMIC); +		inuse = bitmap_zalloc(max_netdevices, GFP_ATOMIC);  		if (!inuse)  			return -ENOMEM; @@ -1109,7 +1109,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)  		}  		i = find_first_zero_bit(inuse, max_netdevices); -		free_page((unsigned long) inuse); +		bitmap_free(inuse);  	}  	snprintf(buf, IFNAMSIZ, name, i);  |