diff mbox

[net-next] net: remove netif_set_real_num_rx_queues()

Message ID 1415648136-4167-1-git-send-email-xiyou.wangcong@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Cong Wang Nov. 10, 2014, 7:35 p.m. UTC
vlan was the only user of netif_set_real_num_rx_queues(),
but it no longer calls it after
commit 4af429d29b341bb1735f04c2fb960178 ("vlan: lockless transmit path").
So we can just remove it.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Edward Cree Nov. 11, 2014, 1:10 p.m. UTC | #1
On 10/11/14 19:35, Cong Wang wrote:
> vlan was the only user of netif_set_real_num_rx_queues(),
> but it no longer calls it after
> commit 4af429d29b341bb1735f04c2fb960178 ("vlan: lockless transmit path").
> So we can just remove it.
>
> Cc: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
>
> ---
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 888d551..4a6f770 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -2762,23 +2762,6 @@ static inline int netif_set_real_num_rx_queues(struct net_device *dev,
>  }
>  #endif
>  
> -static inline int netif_copy_real_num_queues(struct net_device *to_dev,
> -					     const struct net_device *from_dev)
Patch title says you're removing _set_ but body only removes _copy_. 
Which one is right?
> -{
> -	int err;
> -
> -	err = netif_set_real_num_tx_queues(to_dev,
> -					   from_dev->real_num_tx_queues);
> -	if (err)
> -		return err;
> -#ifdef CONFIG_SYSFS
> -	return netif_set_real_num_rx_queues(to_dev,
> -					    from_dev->real_num_rx_queues);
> -#else
> -	return 0;
> -#endif
> -}
> -
>  #ifdef CONFIG_SYSFS
>  static inline unsigned int get_netdev_rx_queue_index(
>  		struct netdev_rx_queue *queue)
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Cong Wang Nov. 11, 2014, 5:07 p.m. UTC | #2
On Tue, Nov 11, 2014 at 5:10 AM, Edward Cree <ecree@solarflare.com> wrote:
>> -static inline int netif_copy_real_num_queues(struct net_device *to_dev,
>> -                                          const struct net_device *from_dev)
> Patch title says you're removing _set_ but body only removes _copy_.
> Which one is right?

Oops, my copy-n-paste error...
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Nov. 11, 2014, 8:22 p.m. UTC | #3
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Tue, 11 Nov 2014 09:07:29 -0800

> On Tue, Nov 11, 2014 at 5:10 AM, Edward Cree <ecree@solarflare.com> wrote:
>>> -static inline int netif_copy_real_num_queues(struct net_device *to_dev,
>>> -                                          const struct net_device *from_dev)
>> Patch title says you're removing _set_ but body only removes _copy_.
>> Which one is right?
> 
> Oops, my copy-n-paste error...

Please resubmit with fixed title, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 888d551..4a6f770 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2762,23 +2762,6 @@  static inline int netif_set_real_num_rx_queues(struct net_device *dev,
 }
 #endif
 
-static inline int netif_copy_real_num_queues(struct net_device *to_dev,
-					     const struct net_device *from_dev)
-{
-	int err;
-
-	err = netif_set_real_num_tx_queues(to_dev,
-					   from_dev->real_num_tx_queues);
-	if (err)
-		return err;
-#ifdef CONFIG_SYSFS
-	return netif_set_real_num_rx_queues(to_dev,
-					    from_dev->real_num_rx_queues);
-#else
-	return 0;
-#endif
-}
-
 #ifdef CONFIG_SYSFS
 static inline unsigned int get_netdev_rx_queue_index(
 		struct netdev_rx_queue *queue)