]> www.infradead.org Git - users/jedix/linux-maple.git/commit
igb: Pull timestamp from fragment before adding it to skb
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Thu, 23 Apr 2015 04:49:17 +0000 (21:49 -0700)
committerBrian Maly <brian.maly@oracle.com>
Tue, 8 Sep 2015 22:26:26 +0000 (18:26 -0400)
commit3416fc7073c9cb26a608bd489024e686d2948b93
tree2d19be534830c9eb60463af1b188dd02393e5b9c
parent12eb5db763c542d06f7ea7840ce3cf88b0f30d76
igb: Pull timestamp from fragment before adding it to skb

Orabug: 21792102

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 <xiyou.wangcong@gmail.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit f56e7bba22fad16c0d4fac996623ce1c13244f8f)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/igb/igb_main.c