From patchwork Wed May 13 17:47:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander H Duyck X-Patchwork-Id: 472036 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D67E9140D16 for ; Thu, 14 May 2015 03:47:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pz1+nFAX; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671AbbEMRrP (ORCPT ); Wed, 13 May 2015 13:47:15 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:35417 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754636AbbEMRrN (ORCPT ); Wed, 13 May 2015 13:47:13 -0400 Received: by iebpz10 with SMTP id pz10so39234549ieb.2 for ; Wed, 13 May 2015 10:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=C/cncgKJfTW/m8Ez55HGGSOxdQRy3CfvKkKE0gYvgiw=; b=pz1+nFAX+RIVHHFdo7PLS8zFCmjXE88sFj0kTmBJ6WLRx51mr5VPpgZc/bILzriCZE GC8DJo1XDO66zdeU7zrhG0aA0y6xNVIk1Ds8Sjj1kUjwW+uV98XVZa0J0JjN+5kRgEsv HwhbAJijiv0PACJb/a3K6PhY2UWJBNI2Wm7F04uCsDy2UKDDcoostEL6bpUtBU9GnTUN 8PnVZ3koBInYlRCI6b+6nTBVdpkY1Iroa8qf9u/TXK9LkbZnPRT7f1dVM9XDksnFdBpr 7fPmVNkPU+80ADuZgh8UIvubyUtI598B3+gCMFcqfAK9mMo70g6Ix2+35oxQLz1IITBS 2qPA== X-Received: by 10.50.30.105 with SMTP id r9mr30004270igh.11.1431539233137; Wed, 13 May 2015 10:47:13 -0700 (PDT) Received: from [192.168.1.188] (50-43-10-6.bvtn.or.frontiernet.net. [50.43.10.6]) by mx.google.com with ESMTPSA id g12sm402683ioe.28.2015.05.13.10.47.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2015 10:47:12 -0700 (PDT) Message-ID: <55538E1F.2020505@gmail.com> Date: Wed, 13 May 2015 10:47:11 -0700 From: Alexander Duyck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: steffen.klassert@secunet.com, David Miller , NetDev Subject: Looking for a lost patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So I am in the process of trying to do some work on VTI6 and in the process of doing so I am trying to setup an IPv4 VTI tunnel and I have come across what appears to be a lost patch. So in commit a32452366b72 ("vti4: Don't count header length twice.") the following change was made: However in commit f895f0cfbb77 ("Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec") the change appears to have been undone as a result of a merge commit. I'm just wondering which is correct. Should the hard_header_len be set or unset in vti_tunnel_init? I ask because I have two kernels and one has the patch and one does not and I am seeing an MTU of 1332 for a VTI tunnel without, and 1480 for a VTI tunnel with. - Alex --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 687ddef..cd62596 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -349,7 +349,6 @@ static int vti_tunnel_init(struct net_device *dev) memcpy(dev->broadcast, &iph->daddr, 4); dev->type = ARPHRD_TUNNEL; - dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN; dev->flags = IFF_NOARP; dev->iflink = 0;