A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source 
Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <[email protected]>
This commit is contained in:
James Morris 2009-08-20 09:18:42 +10:00
commit ece13879e7
358 changed files with 4113 additions and 2128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/ip_gre.c
View file

@ -951,7 +951,7 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev)
addend += 4;
}
dev->needed_headroom = addend + hlen;
mtu -= dev->hard_header_len - addend;
mtu -= dev->hard_header_len + addend;
if (mtu < 68)
mtu = 68;