patch-2.4.21 linux-2.4.21/net/ipv4/ipip.c
Next file: linux-2.4.21/net/ipv4/netfilter/Config.in
Previous file: linux-2.4.21/net/ipv4/ip_fragment.c
Back to the patch index
Back to the overall index
- Lines: 18
- Date:
2003-06-13 07:51:39.000000000 -0700
- Orig file:
linux-2.4.20/net/ipv4/ipip.c
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.20/net/ipv4/ipip.c linux-2.4.21/net/ipv4/ipip.c
@@ -464,11 +464,13 @@
#endif
}
-static inline void ipip_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb)
+static inline void ipip_ecn_decapsulate(struct iphdr *outer_iph, struct sk_buff *skb)
{
- if (INET_ECN_is_ce(iph->tos) &&
- INET_ECN_is_not_ce(skb->nh.iph->tos))
- IP_ECN_set_ce(iph);
+ struct iphdr *inner_iph = skb->nh.iph;
+
+ if (INET_ECN_is_ce(outer_iph->tos) &&
+ INET_ECN_is_not_ce(inner_iph->tos))
+ IP_ECN_set_ce(inner_iph);
}
int ipip_rcv(struct sk_buff *skb)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)