diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /net/rose/rose_route.c | |
| parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
Merge HEAD from ../from-linus
Diffstat (limited to 'net/rose/rose_route.c')
| -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) | |||
| 995 | * 2. It isn't "owned" by any existing route. | 995 | * 2. It isn't "owned" by any existing route. |
| 996 | */ | 996 | */ |
| 997 | if (frametype != ROSE_CALL_REQUEST) { /* XXX */ | 997 | if (frametype != ROSE_CALL_REQUEST) { /* XXX */ |
| 998 | ret = 0; | 998 | res = 0; |
| 999 | goto out; | 999 | goto out; |
| 1000 | } | 1000 | } |
| 1001 | 1001 | ||