Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cb28970 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net: use the new API kvfree() 



It is available since v3.15-rc5.

Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9638f671

net/core/dev.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -5933,10 +5933,7 @@ static void netdev_init_one_queue(struct net_device *dev, 




static void netif_free_tx_queues(struct net_device *dev)

static void netif_free_tx_queues(struct net_device *dev)

{

{

	if (is_vmalloc_addr(dev->_tx))

	kvfree(dev->_tx);

		vfree(dev->_tx);

	else

		kfree(dev->_tx);

}

}





static int netif_alloc_netdev_queues(struct net_device *dev)

static int netif_alloc_netdev_queues(struct net_device *dev)
@@ -6410,10 +6407,7 @@ void netdev_freemem(struct net_device *dev) 
{

{

	char *addr = (char *)dev - dev->padded;

	char *addr = (char *)dev - dev->padded;





	if (is_vmalloc_addr(addr))

	kvfree(addr);

		vfree(addr);

	else

		kfree(addr);

}

}





/**

/**

net/ipv4/tcp_metrics.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1159,10 +1159,7 @@ static void __net_exit tcp_net_metrics_exit(struct net *net) 
			tm = next;

			tm = next;

		}

		}

	}

	}

	if (is_vmalloc_addr(net->ipv4.tcp_metrics_hash))

	kvfree(net->ipv4.tcp_metrics_hash);

		vfree(net->ipv4.tcp_metrics_hash);

	else

		kfree(net->ipv4.tcp_metrics_hash);

}

}





static __net_initdata struct pernet_operations tcp_net_metrics_ops = {

static __net_initdata struct pernet_operations tcp_net_metrics_ops = {

net/netfilter/ipset/ip_set_core.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -271,10 +271,7 @@ ip_set_free(void *members) 
{

{

	pr_debug("%p: free with %s\n", members,

	pr_debug("%p: free with %s\n", members,

		 is_vmalloc_addr(members) ? "vfree" : "kfree");

		 is_vmalloc_addr(members) ? "vfree" : "kfree");

	if (is_vmalloc_addr(members))

	kvfree(members);

		vfree(members);

	else

		kfree(members);

}

}

EXPORT_SYMBOL_GPL(ip_set_free);

EXPORT_SYMBOL_GPL(ip_set_free);

net/netfilter/nft_hash.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -76,10 +76,7 @@ static bool nft_hash_lookup(const struct nft_set *set, 




static void nft_hash_tbl_free(const struct nft_hash_table *tbl)

static void nft_hash_tbl_free(const struct nft_hash_table *tbl)

{

{

	if (is_vmalloc_addr(tbl))

	kvfree(tbl);

		vfree(tbl);

	else

		kfree(tbl);

}

}





static unsigned int nft_hash_tbl_size(unsigned int nelem)

static unsigned int nft_hash_tbl_size(unsigned int nelem)

net/netfilter/xt_recent.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -313,10 +313,7 @@ out: 




static void recent_table_free(void *addr)

static void recent_table_free(void *addr)

{

{

	if (is_vmalloc_addr(addr))

	kvfree(addr);

		vfree(addr);

	else

		kfree(addr);

}

}





static int recent_mt_check(const struct xt_mtchk_param *par,

static int recent_mt_check(const struct xt_mtchk_param *par,