git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netpoll: fix netpoll_send_udp() bugs
[pandora-kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
2877647
..
273cbce
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-791,9
+791,9
@@
static ssize_t sock_sendpage(struct file *file, struct page *page,
sock = file->private_data;
sock = file->private_data;
- flags =
!(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT
;
- if (more)
-
flags |= MSG_MORE
;
+ flags =
(file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0
;
+ /* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */
+
flags |= more
;
return kernel_sendpage(sock, page, offset, size, flags);
}
return kernel_sendpage(sock, page, offset, size, flags);
}
@@
-2472,7
+2472,7
@@
int sock_register(const struct net_proto_family *ops)
lockdep_is_held(&net_family_lock)))
err = -EEXIST;
else {
lockdep_is_held(&net_family_lock)))
err = -EEXIST;
else {
-
RCU_INIT_POINTER
(net_families[ops->family], ops);
+
rcu_assign_pointer
(net_families[ops->family], ops);
err = 0;
}
spin_unlock(&net_family_lock);
err = 0;
}
spin_unlock(&net_family_lock);