From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: [Patch net] fm10k: pass the correct maxlen for eth_get_headlen() Date: Wed, 22 Apr 2015 10:45:58 -0700 Message-ID: <1429724760-10075-2-git-send-email-xiyou.wangcong@gmail.com> References: <1429724760-10075-1-git-send-email-xiyou.wangcong@gmail.com> Cc: intel-wired-lan@lists.osuosl.org, Cong Wang , Jeff Kirsher To: netdev@vger.kernel.org Return-path: Received: from mail-pa0-f52.google.com ([209.85.220.52]:36321 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753973AbbDVRqM (ORCPT ); Wed, 22 Apr 2015 13:46:12 -0400 Received: by pabsx10 with SMTP id sx10so279109250pab.3 for ; Wed, 22 Apr 2015 10:46:12 -0700 (PDT) In-Reply-To: <1429724760-10075-1-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: The second parameter of eth_get_headlen() is the length of the frame buffer, not the header length of skb. Cc: Jeff Kirsher Signed-off-by: Cong Wang --- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c index 1b0661e..cd044b1 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c @@ -543,7 +543,9 @@ static void fm10k_pull_tail(struct sk_buff *skb) /* we need the header to contain the greater of either ETH_HLEN or * 60 bytes if the skb->len is less than 60 for skb_pad. */ - pull_len = eth_get_headlen(va, FM10K_RX_HDR_LEN); + pull_len = eth_get_headlen(va, skb_frag_size(frag)); + if (unlikely(pull_len > FM10K_RX_HDR_LEN)) + pull_len = FM10K_RX_HDR_LEN; /* align pull length to size of long to optimize memcpy performance */ skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long))); -- 1.8.3.1