From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>, netdev@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Herbert Xu <herbert@gondor•apana.org.au>,
Changli Gao <xiaosuo@gmail•com>,
Eric Dumazet <eric.dumazet@gmail•com>
Subject: linux-next: manual merge of the net tree with the net-current tree
Date: Wed, 23 Jun 2010 12:51:16 +1000 [thread overview]
Message-ID: <20100623125116.1370bdd4.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net tree got a conflict in
net/ipv4/ip_output.c between commit
26cde9f7e2747b6d254b704594eed87ab959afa5 ("udp: Fix bogus UFO packet
generation") from the net-current tree and commit
d8d1f30b95a635dbd610dcc5eb641aca8f4768cf ("net-next: remove useless union
keyword") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc net/ipv4/ip_output.c
index 041d41d,6cbeb2e..0000000
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -873,12 -873,10 +873,12 @@@ int ip_append_data(struct sock *sk
!exthdrlen)
csummode = CHECKSUM_PARTIAL;
+ skb = skb_peek_tail(&sk->sk_write_queue);
+
inet->cork.length += length;
- if (((length> mtu) || !skb_queue_empty(&sk->sk_write_queue)) &&
+ if (((length > mtu) || (skb && skb_is_gso(skb))) &&
(sk->sk_protocol == IPPROTO_UDP) &&
- (rt->u.dst.dev->features & NETIF_F_UFO)) {
+ (rt->dst.dev->features & NETIF_F_UFO)) {
err = ip_ufo_append_data(sk, getfrag, from, length, hh_len,
fragheaderlen, transhdrlen, mtu,
flags);
@@@ -1123,9 -1121,8 +1123,9 @@@ ssize_t ip_append_page(struct sock *sk
return -EINVAL;
inet->cork.length += size;
- if ((sk->sk_protocol == IPPROTO_UDP) &&
+ if ((size + skb->len > mtu) &&
+ (sk->sk_protocol == IPPROTO_UDP) &&
- (rt->u.dst.dev->features & NETIF_F_UFO)) {
+ (rt->dst.dev->features & NETIF_F_UFO)) {
skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
}
next reply other threads:[~2010-06-23 2:51 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-23 2:51 Stephen Rothwell [this message]
2010-06-23 4:14 ` linux-next: manual merge of the net tree with the net-current tree Herbert Xu
2010-06-25 18:22 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 2:54 Stephen Rothwell
2011-09-28 5:36 ` David Miller
2011-06-20 2:56 Stephen Rothwell
2011-06-20 3:39 ` Simon Horman
2011-06-20 4:26 ` David Miller
2011-05-17 2:01 Stephen Rothwell
2011-05-10 1:49 Stephen Rothwell
2011-05-10 11:55 ` Sathya.Perla
2011-05-03 3:15 Stephen Rothwell
2011-05-03 3:42 ` David Miller
2011-05-03 4:21 ` Stephen Rothwell
2011-04-19 3:16 Stephen Rothwell
2011-04-19 7:41 ` David Miller
2011-04-07 1:39 Stephen Rothwell
2011-04-07 20:48 ` David Miller
2011-03-08 3:09 Stephen Rothwell
2011-03-08 9:44 ` Dmitry Kravkov
2011-03-09 0:11 ` Stephen Rothwell
2011-03-03 2:40 Stephen Rothwell
2011-02-18 1:20 Stephen Rothwell
2011-02-09 0:56 Stephen Rothwell
2011-02-09 1:06 ` David Miller
2010-12-15 0:45 Stephen Rothwell
2010-11-19 0:17 Stephen Rothwell
2010-11-19 21:14 ` David Miller
2010-11-19 0:17 Stephen Rothwell
2010-11-19 21:11 ` David Miller
2010-10-07 1:31 Stephen Rothwell
2010-10-07 2:35 ` David Miller
2010-10-01 2:48 Stephen Rothwell
2010-10-01 2:48 Stephen Rothwell
2010-10-01 3:27 ` Jerry Chu
2010-10-05 5:47 ` David Miller
2010-09-23 2:14 Stephen Rothwell
2010-08-02 1:04 Stephen Rothwell
2010-07-29 1:19 Stephen Rothwell
2010-07-29 1:26 ` Jeff Kirsher
2010-07-29 1:05 Stephen Rothwell
2010-07-29 5:51 ` Jiri Pirko
2010-07-20 2:20 Stephen Rothwell
2010-07-20 2:34 ` Joe Perches
2010-07-21 1:27 ` David Miller
2010-06-15 2:00 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-30 1:12 ` David Miller
2009-11-24 3:11 Stephen Rothwell
2009-11-25 7:52 ` Jeff Kirsher
2009-11-30 1:11 ` David Miller
2009-11-30 2:46 ` Stephen Rothwell
2009-11-23 1:00 Stephen Rothwell
2009-11-23 1:19 ` David Miller
2009-11-23 2:04 ` Stephen Rothwell
2009-11-23 2:11 ` David Miller
2009-11-23 1:00 Stephen Rothwell
2009-11-23 18:09 ` Amit Salecha
2009-11-23 23:17 ` Stephen Rothwell
2009-11-17 2:16 Stephen Rothwell
2009-11-17 8:00 ` Oliver Hartkopp
2009-11-17 8:16 ` Stephen Rothwell
2009-11-17 8:07 ` David Miller
2009-11-17 8:10 ` Stephen Rothwell
2009-11-09 2:03 Stephen Rothwell
2009-11-09 4:59 ` David Miller
2009-11-06 0:55 Stephen Rothwell
2009-11-06 1:40 ` David Miller
2009-11-06 2:32 ` Stephen Rothwell
2009-08-14 2:40 Stephen Rothwell
2009-08-14 2:50 ` David Miller
2009-08-14 4:19 ` Stephen Rothwell
2009-08-14 5:27 ` Dhananjay Phadke
2009-03-16 5:05 Stephen Rothwell
2009-03-16 6:41 ` Kirsher, Jeffrey T
2009-03-16 8:19 ` Stephen Rothwell
2009-02-12 2:46 Stephen Rothwell
2009-02-15 7:12 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100623125116.1370bdd4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=xiaosuo@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox