netdev
[Top] [All Lists]

ip_gre.c:ipgre_tunnel_xmit() duplicated code ?

To: davem@xxxxxxxxxx (David S. Miller)
Subject: ip_gre.c:ipgre_tunnel_xmit() duplicated code ?
From: Steven Whitehouse <steve@xxxxxxxxxxxxxx>
Date: Mon, 21 Apr 2003 11:21:59 +0100 (BST)
Cc: netdev@xxxxxxxxxxx
In-reply-to: <20030418.034241.38698733.davem@redhat.com> from "David S. Miller" at Apr 18, 2003 03:42:41 AM
Organization: ChyGywn Limited
Reply-to: Steve Whitehouse <Steve@xxxxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
Hi,

I found some code in ip_gre.c which looks to be duplicated. Is the attached
the right fix or did I miss something? 

Steve.
-----------------------------------------------------------------------------

diff -Nru linux-2.5.68/net/ipv4/ip_gre.c linux/net/ipv4/ip_gre.c
--- linux-2.5.68/net/ipv4/ip_gre.c      Sun Apr 20 03:28:01 2003
+++ linux/net/ipv4/ip_gre.c     Mon Apr 21 03:05:23 2003
@@ -777,9 +777,6 @@
                skb->dst->ops->update_pmtu(skb->dst, mtu);
 
        if (skb->protocol == htons(ETH_P_IP)) {
-               if (skb->dst)
-                       skb->dst->ops->update_pmtu(skb->dst, mtu);
-
                df |= (old_iph->frag_off&htons(IP_DF));
 
                if ((old_iph->frag_off&htons(IP_DF)) &&

<Prev in Thread] Current Thread [Next in Thread>