FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-17 22:41:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipv4: Use flowi4 in UDP

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-03-12 02:09:18 -05:00
parent 3073e5ab92
commit b6f21b2680
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/udp.c
View File

@ -770,7 +770,7 @@ static int udp_push_pending_frames(struct sock *sk)
{ {
struct udp_sock *up = udp_sk(sk); struct udp_sock *up = udp_sk(sk);
struct inet_sock *inet = inet_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; struct sk_buff *skb;
int err = 0; int err = 0;
@ -778,7 +778,7 @@ static int udp_push_pending_frames(struct sock *sk)
if (!skb) if (!skb)
goto out; 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: out:
up->len = 0; 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 inet_sock *inet = inet_sk(sk);
struct udp_sock *up = udp_sk(sk); struct udp_sock *up = udp_sk(sk);
struct flowi4 *fl4;
int ulen = len; int ulen = len;
struct ipcm_cookie ipc; struct ipcm_cookie ipc;
struct rtable *rt = NULL; struct rtable *rt = NULL;
@ -972,10 +973,11 @@ back_from_confirm:
/* /*
* Now cork the socket to pend data. * Now cork the socket to pend data.
*/ */
inet->cork.fl.fl4_dst = daddr; fl4 = &inet->cork.fl.u.ip4;
inet->cork.fl.fl4_dport = dport; fl4->daddr = daddr;
inet->cork.fl.fl4_src = saddr; fl4->saddr = saddr;
inet->cork.fl.fl4_sport = inet->inet_sport; fl4->uli.ports.dport = dport;
fl4->uli.ports.sport = inet->inet_sport;
up->pending = AF_INET; up->pending = AF_INET;
do_append_data: do_append_data: