projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[deliverable/linux.git]
/
net
/
ipv4
/
udp.c
diff --git
a/net/ipv4/udp.c
b/net/ipv4/udp.c
index fb23c2e63b5281a7ca505af3ac94f411e10c4ee6..b3f7e8cf18ac4227d298c7d4d659a7d19c50a244 100644
(file)
--- a/
net/ipv4/udp.c
+++ b/
net/ipv4/udp.c
@@
-797,7
+797,7
@@
int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
return -EOPNOTSUPP;
ipc.opt = NULL;
return -EOPNOTSUPP;
ipc.opt = NULL;
- ipc.
shtx.
flags = 0;
+ ipc.
tx_
flags = 0;
if (up->pending) {
/*
if (up->pending) {
/*
@@
-845,7
+845,7
@@
int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
ipc.addr = inet->inet_saddr;
ipc.oif = sk->sk_bound_dev_if;
ipc.addr = inet->inet_saddr;
ipc.oif = sk->sk_bound_dev_if;
- err = sock_tx_timestamp(
msg, sk, &ipc.shtx
);
+ err = sock_tx_timestamp(
sk, &ipc.tx_flags
);
if (err)
return err;
if (msg->msg_controllen) {
if (err)
return err;
if (msg->msg_controllen) {
This page took
0.028609 seconds
and
5
git commands to generate.