| commit | 11532cc6aa73a47023268d718bf43b646494615c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Aug 23 19:21:44 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Aug 23 19:21:44 2005 -0700 |
| tree | 21ce9875e782ca29666fda0b72db0382983fa167 | |
| parent | 17566c3c5ed3ea8f941a135cf960387214c4f6ac [diff] | |
| parent | c1cc168442a943ed3997f6543db87c061987f9d7 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 46b2321..25da6f6 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c
@@ -995,7 +995,7 @@ * 2. It isn't "owned" by any existing route. */ if (frametype != ROSE_CALL_REQUEST) { /* XXX */ - ret = 0; + res = 0; goto out; }