Author: dchagin
Date: Mon May 25 19:55:00 2009
New Revision: 192767
URL: http://svn.freebsd.org/changeset/base/192767
Log:
Merge r191988 from HEAD to stable/7:
Add forgotten linux to bsd flags argument mapping into the linux_recv().
PR: kern/134276
Submitted by: Thomas Mueller <tmueller sysgo com>
Approved by: kib (mentor)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/compat/linux/linux_socket.c
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
Modified: stable/7/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.c Mon May 25 17:06:24 2009
(r192766)
+++ stable/7/sys/compat/linux/linux_socket.c Mon May 25 19:55:00 2009
(r192767)
@@ -871,7 +871,7 @@ linux_recv(struct thread *td, struct lin
bsd_args.s = args->s;
bsd_args.buf = (caddr_t)PTRIN(args->msg);
bsd_args.len = args->len;
- bsd_args.flags = args->flags;
+ bsd_args.flags = linux_to_bsd_msg_flags(args->flags);
bsd_args.from = NULL;
bsd_args.fromlenaddr = 0;
return (recvfrom(td, &bsd_args));
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
