aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 19:21:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 19:21:44 -0700
commit11532cc6aa73a47023268d718bf43b646494615c (patch)
tree21ce9875e782ca29666fda0b72db0382983fa167
parent17566c3c5ed3ea8f941a135cf960387214c4f6ac (diff)
parentc1cc168442a943ed3997f6543db87c061987f9d7 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
-rw-r--r--net/rose/rose_route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 46b23217a353..25da6f699fd0 100644
--- 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;
}

Privacy Policy