diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-19 01:06:44 -0800 |
| commit | b76a852bfb51ffe25505bab3dfd87ddbc821c2aa (patch) | |
| tree | 25e4f88a1d60f92c7f00f19e835a23d1502c5c82 /net/ipv4/ipmr.c | |
| parent | 612cbdcf44289e81a4327d8f67fcc41e07ad33c3 (diff) | |
| parent | 6ab007bf3fd8db711771db1e93880213a63ecd38 (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index ac2b00d8b4..174697063d 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1112,9 +1112,9 @@ static inline int ipmr_forward_finish(struct sk_buff *skb) struct dst_entry *dst = skb->dst; if (skb->len <= dst_pmtu(dst)) - return dst->output(skb); + return dst_output(skb); else - return ip_fragment(skb, dst->output); + return ip_fragment(skb, dst_output); } /* |