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
/
ip_output.c
diff --git
a/net/ipv4/ip_output.c
b/net/ipv4/ip_output.c
index d1bcc9f21d4fb57fc53670f046bcedfe3a98bef0..f0392191740bc2559505c0f37af144f6126f2d9f 100644
(file)
--- a/
net/ipv4/ip_output.c
+++ b/
net/ipv4/ip_output.c
@@
-311,7
+311,7
@@
int ip_output(struct sk_buff *skb)
!(IPCB(skb)->flags & IPSKB_REROUTED));
}
!(IPCB(skb)->flags & IPSKB_REROUTED));
}
-int ip_queue_xmit(struct sk_buff *skb
, int ipfragok
)
+int ip_queue_xmit(struct sk_buff *skb)
{
struct sock *sk = skb->sk;
struct inet_sock *inet = inet_sk(sk);
{
struct sock *sk = skb->sk;
struct inet_sock *inet = inet_sk(sk);
@@
-370,7
+370,7
@@
packet_routed:
skb_reset_network_header(skb);
iph = ip_hdr(skb);
*((__be16 *)iph) = htons((4 << 12) | (5 << 8) | (inet->tos & 0xff));
skb_reset_network_header(skb);
iph = ip_hdr(skb);
*((__be16 *)iph) = htons((4 << 12) | (5 << 8) | (inet->tos & 0xff));
- if (ip_dont_fragment(sk, &rt->u.dst) && !
ipfragok
)
+ if (ip_dont_fragment(sk, &rt->u.dst) && !
skb->local_df
)
iph->frag_off = htons(IP_DF);
else
iph->frag_off = 0;
iph->frag_off = htons(IP_DF);
else
iph->frag_off = 0;
This page took
0.039669 seconds
and
5
git commands to generate.