projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[deliverable/linux.git]
/
net
/
ipv4
/
ipmr.c
diff --git
a/net/ipv4/ipmr.c
b/net/ipv4/ipmr.c
index 7f6273506eea46522a17ff85b9a451cb18fdc7d3..179fcab866fc5f550d580f3ca06b5abd24f0f58a 100644
(file)
--- a/
net/ipv4/ipmr.c
+++ b/
net/ipv4/ipmr.c
@@
-1555,9
+1555,9
@@
static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
goto out_free;
}
goto out_free;
}
- dev = rt->
u.
dst.dev;
+ dev = rt->dst.dev;
- if (skb->len+encap > dst_mtu(&rt->
u.
dst) && (ntohs(iph->frag_off) & IP_DF)) {
+ if (skb->len+encap > dst_mtu(&rt->dst) && (ntohs(iph->frag_off) & IP_DF)) {
/* Do not fragment multicasts. Alas, IPv4 does not
allow to send ICMP, so that packets will disappear
to blackhole.
/* Do not fragment multicasts. Alas, IPv4 does not
allow to send ICMP, so that packets will disappear
to blackhole.
@@
-1568,7
+1568,7
@@
static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
goto out_free;
}
goto out_free;
}
- encap += LL_RESERVED_SPACE(dev) + rt->
u.
dst.header_len;
+ encap += LL_RESERVED_SPACE(dev) + rt->dst.header_len;
if (skb_cow(skb, encap)) {
ip_rt_put(rt);
if (skb_cow(skb, encap)) {
ip_rt_put(rt);
@@
-1579,7
+1579,7
@@
static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
vif->bytes_out += skb->len;
skb_dst_drop(skb);
vif->bytes_out += skb->len;
skb_dst_drop(skb);
- skb_dst_set(skb, &rt->
u.
dst);
+ skb_dst_set(skb, &rt->dst);
ip_decrease_ttl(ip_hdr(skb));
/* FIXME: forward and output firewalls used to be called here.
ip_decrease_ttl(ip_hdr(skb));
/* FIXME: forward and output firewalls used to be called here.
This page took
0.030871 seconds
and
5
git commands to generate.