From 9fae947e360ed4c7a1e3c47f3dbc200ed6fa596e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 1 Nov 2009 19:45:16 +0000
Subject: [PATCH] --- yaml --- r: 171110 b: refs/heads/master c:
 05e8689c9a3a208bf75b60662778d81e23eac460 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/ifb.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9812b5284c0c..c4e7984b8e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3710becf8a58a5c6c4e797e3a3c968c161abdb41
+refs/heads/master: 05e8689c9a3a208bf75b60662778d81e23eac460
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index 030913f8bd26..69c25668dd63 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -98,13 +98,15 @@ static void ri_tasklet(unsigned long dev)
 		stats->tx_packets++;
 		stats->tx_bytes +=skb->len;
 
-		skb->dev = dev_get_by_index(&init_net, skb->iif);
+		rcu_read_lock();
+		skb->dev = dev_get_by_index_rcu(&init_net, skb->iif);
 		if (!skb->dev) {
+			rcu_read_unlock();
 			dev_kfree_skb(skb);
 			stats->tx_dropped++;
 			break;
 		}
-		dev_put(skb->dev);
+		rcu_read_unlock();
 		skb->iif = _dev->ifindex;
 
 		if (from & AT_EGRESS) {