linux-kernel - linux-next: manual merge of the ipsec tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140417113415.62f5b5ef44784891c087def9@canb.auug.org.au>
Date:	Thu, 17 Apr 2014 11:34:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steffen Klassert <steffen.klassert@...unet.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Dichtel <nicolas.dichtel@...nd.com>
Subject: linux-next: manual merge of the ipsec tree with Linus' tree

Hi Steffen,

Today's linux-next merge of the ipsec tree got a conflict in
net/ipv4/ip_vti.c between commit 8d89dcdf80d8 ("vti: don't allow to add
the same tunnel twice") from Linus' tree and commit a32452366b72 ("vti4:
Don't count header length twice") from the ipsec tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/ipv4/ip_vti.c
index afcee51b90ed,cd62596e9a87..000000000000
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@@ -349,7 -348,7 +349,6 @@@ static int vti_tunnel_init(struct net_d
  	memcpy(dev->dev_addr, &iph->saddr, 4);
  	memcpy(dev->broadcast, &iph->daddr, 4);
  
- 	dev->hard_header_len	= LL_MAX_HEADER + sizeof(struct iphdr);
 -	dev->type		= ARPHRD_TUNNEL;
  	dev->mtu		= ETH_DATA_LEN;
  	dev->flags		= IFF_NOARP;
  	dev->iflink		= 0;

Content of type "application/pgp-signature" skipped