forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/smsc911x.c
This commit is contained in:
David S. Miller 2011-04-11 13:44:25 -07:00
commit 1c01a80cfe
2765 changed files with 7223 additions and 8041 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/ip_output.c
View file

@ -603,7 +603,7 @@ slow_path:
/* IF: it doesn't fit, use 'mtu' - the data space left */
if (len > mtu)
len = mtu;
/* IF: we are not sending upto and including the packet end
/* IF: we are not sending up to and including the packet end
then align the next start on an eight byte boundary */
if (len < left) {
len &= ~7;