projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MTD] OneNAND: Add support for auto-placement of out-of-band data
[powerpc.git]
/
net
/
compat.c
diff --git
a/net/compat.c
b/net/compat.c
index
8fd37cd
..
52d32f1
100644
(file)
--- a/
net/compat.c
+++ b/
net/compat.c
@@
-285,8
+285,7
@@
void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
if (i > 0) {
int cmlen = CMSG_COMPAT_LEN(i * sizeof(int));
if (i > 0) {
int cmlen = CMSG_COMPAT_LEN(i * sizeof(int));
- if (!err)
- err = put_user(SOL_SOCKET, &cm->cmsg_level);
+ err = put_user(SOL_SOCKET, &cm->cmsg_level);
if (!err)
err = put_user(SCM_RIGHTS, &cm->cmsg_type);
if (!err)
if (!err)
err = put_user(SCM_RIGHTS, &cm->cmsg_type);
if (!err)
@@
-476,8
+475,7
@@
asmlinkage long compat_sys_setsockopt(int fd, int level, int optname,
int err;
struct socket *sock;
int err;
struct socket *sock;
- /* SO_SET_REPLACE seems to be the same in all levels */
- if (optname == IPT_SO_SET_REPLACE)
+ if (level == SOL_IPV6 && optname == IPT_SO_SET_REPLACE)
return do_netfilter_replace(fd, level, optname,
optval, optlen);
return do_netfilter_replace(fd, level, optname,
optval, optlen);