From 63f45d0da75e3346605691d8bc782949ff1bd81c Mon Sep 17 00:00:00 2001 From: Tom Herbert Date: Tue, 9 Nov 2010 10:47:30 +0000 Subject: [PATCH] --- yaml --- r: 224163 b: refs/heads/master c: ed9af2e839c06c18f721da2c768fbb444c4a10e5 h: refs/heads/master i: 224161: 59d992b9538da72a028557b6164a53ec34d30f56 224159: 6384bc1c3a20ae95b6961675b9090f9c5bb37801 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 759f6ce647f1..3bc9d4461236 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc9ff19da9bf76a2f70bcb80225a1c587c162e52 +refs/heads/master: ed9af2e839c06c18f721da2c768fbb444c4a10e5 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 8b500c3e0297..75490670e0a9 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5136,10 +5136,6 @@ int register_netdevice(struct net_device *dev) if (ret) goto out; - ret = netif_alloc_netdev_queues(dev); - if (ret) - goto out; - netdev_init_queues(dev); /* Init, if this function is available */ @@ -5599,6 +5595,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, dev->num_tx_queues = queue_count; dev->real_num_tx_queues = queue_count; + if (netif_alloc_netdev_queues(dev)) + goto free_pcpu; #ifdef CONFIG_RPS dev->num_rx_queues = queue_count; @@ -5619,6 +5617,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, free_pcpu: free_percpu(dev->pcpu_refcnt); + kfree(dev->_tx); free_p: kfree(p); return NULL;