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

11532cc6 · Linus Torvalds · 17566c3c · c1cc1684 · 11532cc6
Commit 11532cc6 authored Aug 23, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/rose/rose_route.c net/rose/rose_route.c +1 -1

No files found.
--- 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;
 	}