---

yaml --- r: 315723 b: refs/heads/master c: ee6ae1a h: refs/heads/master i: 315721: ad7afb4 315719: 94c5e8f v: v3
git-mirror · Jul 20, 2012 · d3982be · d3982be
1 parent 1fb3939
commit d3982be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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);