Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 808ff676 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Garzik
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 2d06cad1

drivers/net/e1000e/netdev.c

+6 −3
Original line number Diff line number Diff line
@@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 
			    netdev_alloc_skb(netdev, length + NET_IP_ALIGN);

			if (new_skb) {

				skb_reserve(new_skb, NET_IP_ALIGN);

				memcpy(new_skb->data - NET_IP_ALIGN,

				       skb->data - NET_IP_ALIGN,

				       length + NET_IP_ALIGN);

				skb_copy_to_linear_data_offset(new_skb,

							       -NET_IP_ALIGN,

							       (skb->data -

								NET_IP_ALIGN),

							       (length +

								NET_IP_ALIGN));

				/* save the skb in buffer_info as good */

				buffer_info->skb = skb;

				skb = new_skb;