---

yaml --- r: 221639 b: refs/heads/master c: 1f1b9c9 h: refs/heads/master i: 221637: aa7c39e 221635: 2a4b105 221631: 19b12be v: v3
git-mirror · Nov 4, 2010 · b6ad4bf · b6ad4bf
1 parent 56d112b
commit b6ad4bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cccbe5ef85284621d19e5b2b1c61cc0506bc9dee
+refs/heads/master: 1f1b9c9990205759aae31b7734b0ede41a867f32
diff --git a/trunk/net/ipv4/fib_lookup.h b/trunk/net/ipv4/fib_lookup.h
@@ -47,11 +47,8 @@ extern int fib_detect_death(struct fib_info *fi, int order,
 static inline void fib_result_assign(struct fib_result *res,
 				     struct fib_info *fi)
 {
-	if (res->fi != NULL)
-		fib_info_put(res->fi);
+	/* we used to play games with refcounts, but we now use RCU */
 	res->fi = fi;
-	if (fi != NULL)
-		atomic_inc(&fi->fib_clntref);
 }
 
 #endif /* _FIB_LOOKUP_H */