Commit 11532cc6 authored by Linus Torvalds's avatar Linus Torvalds

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

parents 17566c3c c1cc1684
...@@ -995,7 +995,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) ...@@ -995,7 +995,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
* 2. It isn't "owned" by any existing route. * 2. It isn't "owned" by any existing route.
*/ */
if (frametype != ROSE_CALL_REQUEST) { /* XXX */ if (frametype != ROSE_CALL_REQUEST) { /* XXX */
ret = 0; res = 0;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment