diff --git a/[refs] b/[refs] index ebd329c15141..b1dbd1394417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79fbe134832ebb70a49d8802cfeb2401dc35bb38 +refs/heads/master: 8660c1240ec6016522b882c88751cb4ce40bf0e8 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index b47b3f039d14..f2c69a2cca17 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/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. */