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

This commit is contained in:
Linus Torvalds 2005-08-23 19:21:44 -07:00
commit 11532cc6aa
1 changed files with 1 additions and 1 deletions

View File

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