From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751616AbaHSU4Q (ORCPT ); Tue, 19 Aug 2014 16:56:16 -0400 Received: from mail-pd0-f196.google.com ([209.85.192.196]:56676 "EHLO mail-pd0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750861AbaHSU4P (ORCPT ); Tue, 19 Aug 2014 16:56:15 -0400 From: Haiyang Zhang To: davem@davemloft.net, netdev@vger.kernel.org Cc: haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de, jasowang@redhat.com, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org Subject: [PATCH net-next] hyperv: Add handling of IP header with option field in netvsc_set_hash() Date: Tue, 19 Aug 2014 20:53:55 +0000 Message-Id: <1408481635-29639-1-git-send-email-haiyangz@microsoft.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case that the IP header has optional field at the end, this patch will get the port numbers after that field, and compute the hash. Signed-off-by: Haiyang Zhang Reviewed-by: K. Y. Srinivasan --- drivers/net/hyperv/netvsc_drv.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index a9c5eaa..b12dcd9 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -191,6 +191,8 @@ static u32 comp_hash(u8 *key, int klen, u8 *data, int dlen) static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb) { struct iphdr *iphdr; + u8 dbuf[12]; + u8 *data; int data_len; bool ret = false; @@ -200,12 +202,18 @@ static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb) iphdr = ip_hdr(skb); if (iphdr->version == 4) { - if (iphdr->protocol == IPPROTO_TCP) + data = (u8 *)&iphdr->saddr; + if (iphdr->protocol == IPPROTO_TCP) { data_len = 12; - else + if (iphdr->ihl > 5) { + memcpy(dbuf, &iphdr->saddr, 8); + memcpy(&dbuf[8], &tcp_hdr(skb)->source, 4); + data = dbuf; + } + } else { data_len = 8; - *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, - (u8 *)&iphdr->saddr, data_len); + } + *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, data, data_len); ret = true; } -- 1.7.1