diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /net/ipv6/ip6_output.c | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 61e2bef56090..7db09c3f5289 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -625,7 +625,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) | |||
| 625 | /* We must not fragment if the socket is set to force MTU discovery | 625 | /* We must not fragment if the socket is set to force MTU discovery |
| 626 | * or if the skb it not generated by a local socket. | 626 | * or if the skb it not generated by a local socket. |
| 627 | */ | 627 | */ |
| 628 | if (!skb->local_df) { | 628 | if (!skb->local_df && skb->len > mtu) { |
| 629 | skb->dev = skb_dst(skb)->dev; | 629 | skb->dev = skb_dst(skb)->dev; |
| 630 | icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); | 630 | icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); |
| 631 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), | 631 | IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), |