From d3982be5e9482b302f4bb5af222b170782bb61f6 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 20 Jul 2012 02:28:46 +0000 Subject: [PATCH] --- yaml --- r: 315723 b: refs/heads/master c: ee6ae1a1d58c70fc864bc777a36be56b0880ebff h: refs/heads/master i: 315721: ad7afb49e6f4b4101063800171dee42793a54fc6 315719: 94c5e8fa3d4cfe48d89b0176407763b6ff41f3bf v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 84720e072cfe..3c2d206d8191 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f458dfb409272082c9bfa412f77ff2fc21c626f +refs/heads/master: ee6ae1a1d58c70fc864bc777a36be56b0880ebff diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index ab0251d541ab..eb06e58bed0b 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -2110,7 +2110,12 @@ static inline int netif_set_real_num_rx_queues(struct net_device *dev, static inline int netif_copy_real_num_queues(struct net_device *to_dev, const struct net_device *from_dev) { - netif_set_real_num_tx_queues(to_dev, from_dev->real_num_tx_queues); + int err; + + err = netif_set_real_num_tx_queues(to_dev, + from_dev->real_num_tx_queues); + if (err) + return err; #ifdef CONFIG_RPS return netif_set_real_num_rx_queues(to_dev, from_dev->real_num_rx_queues);