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/wireless/orinoco/main.c
This commit is contained in:
David S. Miller 2009-07-16 20:21:24 -07:00
commit da8120355e
40 changed files with 192 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/skbuff.h
View file

@ -1342,12 +1342,12 @@ static inline int skb_network_offset(const struct sk_buff *skb)
* shifting the start of the packet by 2 bytes. Drivers should do this
* with:
*
* skb_reserve(NET_IP_ALIGN);
* skb_reserve(skb, NET_IP_ALIGN);
*
* The downside to this alignment of the IP header is that the DMA is now
* unaligned. On some architectures the cost of an unaligned DMA is high
* and this cost outweighs the gains made by aligning the IP header.
*
*
* Since this trade off varies between architectures, we allow NET_IP_ALIGN
* to be overridden.
*/