summaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 02:09:18 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 15:08:50 -0800
commitb6f21b268026165a239edb5f4d7120eacf7bc593 (patch)
treeee03e4fd4a48483bd4d0c21687509d93a3e91729 /net/ipv4/udp.c
parent3073e5ab927487328d48cd74faac0f95a8336867 (diff)
downloadop-kernel-dev-b6f21b268026165a239edb5f4d7120eacf7bc593.zip
op-kernel-dev-b6f21b268026165a239edb5f4d7120eacf7bc593.tar.gz
ipv4: Use flowi4 in UDP
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 25c0807..91cba3c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -770,7 +770,7 @@ static int udp_push_pending_frames(struct sock *sk)
{
struct udp_sock *up = udp_sk(sk);
struct inet_sock *inet = inet_sk(sk);
- struct flowi *fl = &inet->cork.fl;
+ struct flowi4 *fl4 = &inet->cork.fl.u.ip4;
struct sk_buff *skb;
int err = 0;
@@ -778,7 +778,7 @@ static int udp_push_pending_frames(struct sock *sk)
if (!skb)
goto out;
- err = udp_send_skb(skb, fl->fl4_dst, fl->fl4_dport);
+ err = udp_send_skb(skb, fl4->daddr, fl4->uli.ports.dport);
out:
up->len = 0;
@@ -791,6 +791,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
{
struct inet_sock *inet = inet_sk(sk);
struct udp_sock *up = udp_sk(sk);
+ struct flowi4 *fl4;
int ulen = len;
struct ipcm_cookie ipc;
struct rtable *rt = NULL;
@@ -972,10 +973,11 @@ back_from_confirm:
/*
* Now cork the socket to pend data.
*/
- inet->cork.fl.fl4_dst = daddr;
- inet->cork.fl.fl4_dport = dport;
- inet->cork.fl.fl4_src = saddr;
- inet->cork.fl.fl4_sport = inet->inet_sport;
+ fl4 = &inet->cork.fl.u.ip4;
+ fl4->daddr = daddr;
+ fl4->saddr = saddr;
+ fl4->uli.ports.dport = dport;
+ fl4->uli.ports.sport = inet->inet_sport;
up->pending = AF_INET;
do_append_data:
OpenPOWER on IntegriCloud