aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-08 20:12:19 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-09 00:24:06 -0400
commit77968b78242ee25e2a4d759f0fca8dd52df6d479 (patch)
tree6de21f3a2efe49cb30ea8109fdfc79d30d6b27a3 /net/ipv4/udp.c
parente474995f290ff7bc236b549aa9a89ae445ee5b1b (diff)
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index ba9f137f5aa7..006e2ccd6cc2 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -774,7 +774,7 @@ static int udp_push_pending_frames(struct sock *sk)
774 struct sk_buff *skb; 774 struct sk_buff *skb;
775 int err = 0; 775 int err = 0;
776 776
777 skb = ip_finish_skb(sk); 777 skb = ip_finish_skb(sk, fl4);
778 if (!skb) 778 if (!skb)
779 goto out; 779 goto out;
780 780
@@ -958,7 +958,7 @@ back_from_confirm:
958 958
959 /* Lockless fast path for the non-corking case. */ 959 /* Lockless fast path for the non-corking case. */
960 if (!corkreq) { 960 if (!corkreq) {
961 skb = ip_make_skb(sk, getfrag, msg->msg_iov, ulen, 961 skb = ip_make_skb(sk, fl4, getfrag, msg->msg_iov, ulen,
962 sizeof(struct udphdr), &ipc, &rt, 962 sizeof(struct udphdr), &ipc, &rt,
963 msg->msg_flags); 963 msg->msg_flags);
964 err = PTR_ERR(skb); 964 err = PTR_ERR(skb);