---

yaml --- r: 171155 b: refs/heads/master c: d007563 h: refs/heads/master i: 171153: d12436c 171151: 4ae4623 v: v3
git-mirror · Nov 4, 2009 · ec81361 · ec81361
1 parent e39cb4f
commit ec81361
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7079857cd89cb5bc686df1d441db8ef0137abf1
+refs/heads/master: d0075634cf9d288988f57392a1f132d2053af961
diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c
@@ -303,17 +303,17 @@ META_COLLECTOR(var_sk_bound_if)
 {
 	SKIP_NONLOCAL(skb);
 
-	 if (skb->sk->sk_bound_dev_if == 0) {
+	if (skb->sk->sk_bound_dev_if == 0) {
 		dst->value = (unsigned long) "any";
 		dst->len = 3;
-	 } else  {
+	} else {
 		struct net_device *dev;
 
-		dev = dev_get_by_index(&init_net, skb->sk->sk_bound_dev_if);
+		rcu_read_lock();
+		dev = dev_get_by_index_rcu(&init_net, skb->sk->sk_bound_dev_if);
 		*err = var_dev(dev, dst);
-		if (dev)
-			dev_put(dev);
-	 }
+		rcu_read_unlock();
+	}
 }
 
 META_COLLECTOR(int_sk_refcnt)