diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 19:57:05 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 19:57:05 +0300 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /net/ipv4/udp.c | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index fb23c2e63b5..b3f7e8cf18a 100644 --- 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; - ipc.shtx.flags = 0; + ipc.tx_flags = 0; 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; - err = sock_tx_timestamp(msg, sk, &ipc.shtx); + err = sock_tx_timestamp(sk, &ipc.tx_flags); if (err) return err; if (msg->msg_controllen) { |