From: Thomas Graf <tgraf@suug.ch>
To: davem@davemloft.net
Cc: jheffner@psc.edu, netdev@vger.kernel.org
Subject: [NET]: Fix breakage, use ip_hdr() for DF check in ip_forward
Date: Sun, 25 Mar 2007 15:37:31 +0200 [thread overview]
Message-ID: <20070325133731.GH521@postel.suug.ch> (raw)
In-Reply-To: <11746948061847-git-send-email-jheffner@psc.edu>
The patch [NET] Move DF check to ip_forward broke net-2.6.22 as
skb->nh has been renamed to skb->network_header. Use ip_hdr().
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Index: net-2.6.22/net/ipv4/ip_forward.c
===================================================================
--- net-2.6.22.orig/net/ipv4/ip_forward.c 2007-03-25 15:31:32.000000000 +0200
+++ net-2.6.22/net/ipv4/ip_forward.c 2007-03-25 15:32:21.000000000 +0200
@@ -86,7 +86,7 @@ int ip_forward(struct sk_buff *skb)
goto sr_failed;
if (unlikely(skb->len > dst_mtu(&rt->u.dst) &&
- (skb->nh.iph->frag_off & htons(IP_DF))) && !skb->local_df) {
+ (ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) {
IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(dst_mtu(&rt->u.dst)));
next prev parent reply other threads:[~2007-03-25 13:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-24 0:06 [PATCH 1/3] [NET] Do pmtu check in transport layer John Heffner
2007-03-24 0:06 ` [PATCH 2/3] [NET] Move DF check to ip_forward John Heffner
2007-03-24 0:06 ` [PATCH 3/3] [NET] Add IP(V6)_PMTUDISC_RPOBE John Heffner
2007-03-25 4:23 ` David Miller
2007-03-27 14:18 ` Andi Kleen
[not found] ` <4609640D.7010709@psc.edu>
[not found] ` <20070327193115.GA28138@one.firstfloor.org>
2007-03-27 19:52 ` [PATCH] ip(7) IP_PMTUDISC_PROBE John Heffner
2007-04-08 18:08 ` Michael Kerrisk
2007-03-25 4:17 ` [PATCH 2/3] [NET] Move DF check to ip_forward David Miller
2007-03-25 13:37 ` Thomas Graf [this message]
2007-03-25 20:27 ` [NET]: Fix breakage, use ip_hdr() for DF check in ip_forward David Miller
2007-03-25 4:14 ` [PATCH 1/3] [NET] Do pmtu check in transport layer David Miller
2007-04-09 8:40 ` Patrick McHardy
2007-04-09 16:23 ` John Heffner
2007-04-09 16:40 ` Patrick McHardy
2007-04-19 1:07 ` [PATCH 0/0] Re-try changes for PMTUDISC_PROBE John Heffner
2007-04-20 22:55 ` David Miller
2007-04-19 1:07 ` [PATCH] Revert "[NET] Add IP(V6)_PMTUDISC_RPOBE" John Heffner
2007-04-19 1:07 ` [PATCH] Revert "[NET] Do pmtu check in transport layer" John Heffner
2007-04-19 1:07 ` [PATCH] [NET] MTU discovery check in ip6_fragment() John Heffner
2007-04-19 1:07 ` [PATCH] [NET] Add IP(V6)_PMTUDISC_RPOBE John Heffner
2007-04-19 1:11 ` John Heffner
2007-04-19 1:25 ` David Miller
2007-04-19 1:09 ` [PATCH 1/4] Revert "[NET] Add IP(V6)_PMTUDISC_RPOBE" John Heffner
2007-04-19 1:09 ` [PATCH 2/4] Revert "[NET] Do pmtu check in transport layer" John Heffner
2007-04-19 1:09 ` [PATCH 3/4] [NET] MTU discovery check in ip6_fragment() John Heffner
2007-04-19 1:09 ` [PATCH 4/4] [NET] Add IP(V6)_PMTUDISC_RPOBE John Heffner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070325133731.GH521@postel.suug.ch \
--to=tgraf@suug.ch \
--cc=davem@davemloft.net \
--cc=jheffner@psc.edu \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).