From: Alexander Duyck Date: Thu, 23 Apr 2015 04:49:17 +0000 (-0700) Subject: igb: Pull timestamp from fragment before adding it to skb X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~340^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f56e7bba22fad16c0d4fac996623ce1c13244f8f;p=pandora-kernel.git igb: Pull timestamp from fragment before adding it to skb This change makes it so that we pull the timestamp from the fragment before we add it to the skb. By doing this we can avoid a possible issue in which the fragment can possibly be less than IGB_RX_HDR_LEN due to the timestamp being pulled after the copybreak check. While making this change I realized we could also pull the rest of the igb_pull_tail function into igb_add_rx_frag since in the case of igb, unlike ixgbe, we are able to unmap the entire buffer before calling add_rx_frag so merging the two allows for sharing of code between the two merged functions. Reported-by: Cong Wang Signed-off-by: Alexander Duyck Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- Reading git-diff-tree failed