diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-08 17:12:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-08 21:24:06 -0700 |
| commit | 77968b78242ee25e2a4d759f0fca8dd52df6d479 (patch) | |
| tree | 6de21f3a2efe49cb30ea8109fdfc79d30d6b27a3 /net/ipv4/udp.c | |
| parent | e474995f290ff7bc236b549aa9a89ae445ee5b1b (diff) | |
| download | op-kernel-dev-77968b78242ee25e2a4d759f0fca8dd52df6d479.zip op-kernel-dev-77968b78242ee25e2a4d759f0fca8dd52df6d479.tar.gz | |
ipv4: Pass flow keys down into datagram packet building engine.
This way ip_output.c no longer needs rt->rt_{src,dst}.
We already have these keys sitting, ready and waiting, on the stack or
in a socket structure.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 ba9f137..006e2cc 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -774,7 +774,7 @@ static int udp_push_pending_frames(struct sock *sk) struct sk_buff *skb; int err = 0; - skb = ip_finish_skb(sk); + skb = ip_finish_skb(sk, fl4); if (!skb) goto out; @@ -958,7 +958,7 @@ back_from_confirm: /* Lockless fast path for the non-corking case. */ if (!corkreq) { - skb = ip_make_skb(sk, getfrag, msg->msg_iov, ulen, + skb = ip_make_skb(sk, fl4, getfrag, msg->msg_iov, ulen, sizeof(struct udphdr), &ipc, &rt, msg->msg_flags); err = PTR_ERR(skb); |
