e1000e: Use skb_copy_to_linear_data_offset introduced in 2.6.22

The e1000e driver was based on a version of e1000 prior to acme's
introduction of skb_copy_to_linear_data_offset, and was submitted
after acme went through and coverted all the drivers to use it.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Bruce Allan 2008-08-08 18:35:56 -07:00 committed by Jeff Garzik
parent 2d06cad1a5
commit 808ff676c4

View File

@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
netdev_alloc_skb(netdev, length + NET_IP_ALIGN); netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
if (new_skb) { if (new_skb) {
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
memcpy(new_skb->data - NET_IP_ALIGN, skb_copy_to_linear_data_offset(new_skb,
skb->data - NET_IP_ALIGN, -NET_IP_ALIGN,
length + NET_IP_ALIGN); (skb->data -
NET_IP_ALIGN),
(length +
NET_IP_ALIGN));
/* save the skb in buffer_info as good */ /* save the skb in buffer_info as good */
buffer_info->skb = skb; buffer_info->skb = skb;
skb = new_skb; skb = new_skb;