From patchwork Sat Jul 11 13:01:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hlusiak X-Patchwork-Id: 29700 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id AA6CBB6F1F for ; Sat, 11 Jul 2009 23:03:34 +1000 (EST) Received: by ozlabs.org (Postfix) id 9B5F7DDDFA; Sat, 11 Jul 2009 23:03:34 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 2BF7BDDDF7 for ; Sat, 11 Jul 2009 23:03:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751133AbZGKND2 (ORCPT ); Sat, 11 Jul 2009 09:03:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751136AbZGKND1 (ORCPT ); Sat, 11 Jul 2009 09:03:27 -0400 Received: from moutng.kundenserver.de ([212.227.126.188]:61523 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbZGKND0 (ORCPT ); Sat, 11 Jul 2009 09:03:26 -0400 Received: from localhost.localdomain (p57B3447C.dip.t-dialin.net [87.179.68.124]) by mrelayeu.kundenserver.de (node=mrelayeu3) with ESMTP (Nemesis) id 0MKxQS-1MPcEL2Dn8-0003Cj; Sat, 11 Jul 2009 15:03:06 +0200 From: Sascha Hlusiak To: netdev@vger.kernel.org Cc: berni@birkenwald.de, Sascha Hlusiak Subject: [PATCH] sit: fix regression: do not release skb->dst before xmit Date: Sat, 11 Jul 2009 15:01:29 +0200 Message-Id: <1247317289-27867-1-git-send-email-contact@saschahlusiak.de> X-Mailer: git-send-email 1.6.3.3 X-Provags-ID: V01U2FsdGVkX1/cT369fFMYn0yn/gdHNIXHSmsVCdeZ4ULZiex KCXst0i9I2Ela+88UlFtIoS+XrNN1s2HQZFa7++8ymp2P98w9M 9Ahf95xC0iVxIMRtTz100UAEikOuUA4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The sit module makes use of skb->dst in it's xmit function, so since 93f154b594fe47 sit tunnels are broken, because the flag IFF_XMIT_DST_RELEASE is not unset. This patch unsets that flag for sit devices to fix this regression. Signed-off-by: Sascha Hlusiak Acked-by: Eric Dumazet --- net/ipv6/sit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 68e5230..98b7327 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1018,6 +1018,7 @@ static void ipip6_tunnel_setup(struct net_device *dev) dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr); dev->flags = IFF_NOARP; + dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; dev->iflink = 0; dev->addr_len = 4; dev->features |= NETIF_F_NETNS_LOCAL;