The patch titled e1000e: use skb_copy_to_linear_data_offset introduced in 2.6.22 has been added to the -mm tree. Its filename is e1000e-use-skb_copy_to_linear_data_offset-introduced-in-2622.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: e1000e: use skb_copy_to_linear_data_offset introduced in 2.6.22 From: Bruce Allan <bruce.w.allan@xxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/e1000e/netdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff -puN drivers/net/e1000e/netdev.c~e1000e-use-skb_copy_to_linear_data_offset-introduced-in-2622 drivers/net/e1000e/netdev.c --- a/drivers/net/e1000e/netdev.c~e1000e-use-skb_copy_to_linear_data_offset-introduced-in-2622 +++ a/drivers/net/e1000e/netdev.c @@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1 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; _ Patches currently in -mm which might be from bruce.w.allan@xxxxxxxxx are origin.patch e1000e-remove-inapplicable-test-for-ioport-checkpatch-fixes.patch e1000e-return-1-instead-of-a-non-zero-value-for-link-up-indication.patch e1000e-set-interruptthrottlerate-to-default-when-invalid-value-used.patch e1000e-use-skb_copy_to_linear_data_offset-introduced-in-2622.patch e1000e-increase-tx-timeout-factor-for-10mbps.patch e1000e-increase-minimum-frame-size-allowed.patch e1000e-test-for-unusable-msi-support.patch e1000e-remove-unnecessary-snippet-missed-in-prior-check_options-update.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html