diff --git a/[refs] b/[refs] index 2586648e1110..96886fb0f7b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd112f2e15ba85d387de446a81aeb11e46ecc55d +refs/heads/master: 4ff75b7cf3b06efb72a50e26008d09b259b1231b diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index e8b78ce14474..f3af147c211d 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -2023,8 +2023,7 @@ static inline void sw_tx_timestamp(struct sk_buff *skb) * skb_tx_timestamp() - Driver hook for transmit timestamping * * Ethernet MAC Drivers should call this function in their hard_xmit() - * function as soon as possible after giving the sk_buff to the MAC - * hardware, but before freeing the sk_buff. + * function immediately before giving the sk_buff to the MAC hardware. * * @skb: A socket buffer. */