Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2993219AbXEBOHL (ORCPT ); Wed, 2 May 2007 10:07:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S2993210AbXEBOHK (ORCPT ); Wed, 2 May 2007 10:07:10 -0400 Received: from mtagate7.uk.ibm.com ([195.212.29.140]:47423 "EHLO mtagate7.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2993217AbXEBOHI (ORCPT ); Wed, 2 May 2007 10:07:08 -0400 From: Thomas Klein To: Jeff Garzik Subject: [PATCH] ehea: Fix skb header access Date: Wed, 2 May 2007 16:07:05 +0200 User-Agent: KMail/1.8.2 Cc: Christoph Raisch , "Jan-Bernd Themann" , "Jan-Bernd Themann" , "linux-kernel" , "linux-ppc" , Marcus Eder , netdev , Thomas Klein , Stefan Roscher MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200705021607.05338.osstklei@de.ibm.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1031 Lines: 31 Adapt to new skb header access functions. Signed-off-by: Thomas Klein --- diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index c7a5614..7211648 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -1803,10 +1803,10 @@ static inline int ehea_hash_skb(struct s u32 tmp; if ((skb->protocol == htons(ETH_P_IP)) && - (skb->nh.iph->protocol == IPPROTO_TCP)) { - tcp = (struct tcphdr*)(skb->nh.raw + (skb->nh.iph->ihl * 4)); + (ip_hdr(skb)->protocol == IPPROTO_TCP)) { + tcp = (struct tcphdr*)(skb_network_header(skb) + (ip_hdr(skb)->ihl * 4)); tmp = (tcp->source + (tcp->dest << 16)) % 31; - tmp += skb->nh.iph->daddr % 31; + tmp += ip_hdr(skb)->daddr % 31; return tmp % num_qps; } else - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/