diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-16 20:21:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-16 20:21:24 -0700 |
commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /include/linux | |
parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) | |
download | linux-stable-da8120355e80ddaf534adb8ed910871d97512d56.tar.gz linux-stable-da8120355e80ddaf534adb8ed910871d97512d56.tar.bz2 linux-stable-da8120355e80ddaf534adb8ed910871d97512d56.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index b47b3f039d14..f2c69a2cca17 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -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. */ |