diff options
| author | Linus Torvalds | 2005-08-24 04:21:44 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-08-24 04:21:44 +0200 |
| commit | 11532cc6aa73a47023268d718bf43b646494615c (patch) | |
| tree | 21ce9875e782ca29666fda0b72db0382983fa167 | |
| parent | [PATCH] s390 __CHECKER__ ifdefs (diff) | |
| parent | [ROSE]: Fix typo in rose_route_frame() locking fix. (diff) | |
| download | kernel-qcow2-linux-11532cc6aa73a47023268d718bf43b646494615c.tar.gz kernel-qcow2-linux-11532cc6aa73a47023268d718bf43b646494615c.tar.xz kernel-qcow2-linux-11532cc6aa73a47023268d718bf43b646494615c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/rose/rose_route.c | 2 |
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; } |