Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

git-mirror · Aug 24, 2005 · 11532cc · 11532cc
2 parents 17566c3 + c1cc168
commit 11532cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
@@ -995,7 +995,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
 	 *	2. It isn't "owned" by any existing route.
 	 */
 	if (frametype != ROSE_CALL_REQUEST) {	/* XXX */
-		ret = 0;
+		res = 0;
 		goto out;
 	}