From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123Ab0IWCOS (ORCPT ); Wed, 22 Sep 2010 22:14:18 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:60254 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015Ab0IWCOR (ORCPT ); Wed, 22 Sep 2010 22:14:17 -0400 Date: Thu, 23 Sep 2010 12:14:13 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet Subject: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20100923121413.d48e2b1b.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net tree got a conflict in net/ipv4/ip_output.c between commit 3d13008e7345fa7a79d8f6438150dc15d6ba6e9d ("ip: fix truesize mismatch in ip fragmentation") from the net-current tree and commit 21dc330157454046dd7c494961277d76e1c957fe ("net: Rename skb_has_frags to skb_has_frag_list") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/ipv4/ip_output.c index 7649d77,e427620..0000000 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@@ -487,9 -487,10 +487,9 @@@ int ip_fragment(struct sk_buff *skb, in * LATER: this step can be merged to real generation of fragments, * we can switch to copy when see the first bad fragment. */ - if (skb_has_frags(skb)) { + if (skb_has_frag_list(skb)) { - struct sk_buff *frag; + struct sk_buff *frag, *frag2; int first_len = skb_pagelen(skb); - int truesizes = 0; if (first_len - hlen > mtu || ((first_len - hlen) & 7) ||