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 46b23217a35309ac60e2ae33d5d054faef5dd1ef..25da6f699fd03c7b748cca110d42eb68eb54da27 100644 (file)
--- 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;
        }