diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /net/ipv4 | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 5b1af70cd80..533afaadefd 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -951,7 +951,7 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev) | |||
| 951 | addend += 4; | 951 | addend += 4; |
| 952 | } | 952 | } |
| 953 | dev->needed_headroom = addend + hlen; | 953 | dev->needed_headroom = addend + hlen; |
| 954 | mtu -= dev->hard_header_len - addend; | 954 | mtu -= dev->hard_header_len + addend; |
| 955 | 955 | ||
| 956 | if (mtu < 68) | 956 | if (mtu < 68) |
| 957 | mtu = 68; | 957 | mtu = 68; |