aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-06-02 18:55:22 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-05 03:49:51 -0400
commit4cb28970a23ff209199b0a4358d68efe82c8f493 (patch)
tree6fddc9391d7803318fb0903ffd101dc7837f5a30 /net/core
parent9638f6713ff556bdc34e9d18eeb7c1b25b35e5ce (diff)
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: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 5367bfba0947..a9a08e4a4857 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5933,10 +5933,7 @@ static void netdev_init_one_queue(struct net_device *dev,
5933 5933
5934static void netif_free_tx_queues(struct net_device *dev) 5934static void netif_free_tx_queues(struct net_device *dev)
5935{ 5935{
5936 if (is_vmalloc_addr(dev->_tx)) 5936 kvfree(dev->_tx);
5937 vfree(dev->_tx);
5938 else
5939 kfree(dev->_tx);
5940} 5937}
5941 5938
5942static int netif_alloc_netdev_queues(struct net_device *dev) 5939static int netif_alloc_netdev_queues(struct net_device *dev)
@@ -6410,10 +6407,7 @@ void netdev_freemem(struct net_device *dev)
6410{ 6407{
6411 char *addr = (char *)dev - dev->padded; 6408 char *addr = (char *)dev - dev->padded;
6412 6409
6413 if (is_vmalloc_addr(addr)) 6410 kvfree(addr);
6414 vfree(addr);
6415 else
6416 kfree(addr);
6417} 6411}
6418 6412
6419/** 6413/**