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

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;
         }