* [PATCH 4/8] net: rps: use proto_ports_offset() to handle the AH message correctly
@ 2010-08-18 5:04 Changli Gao
2010-08-20 0:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Changli Gao @ 2010-08-18 5:04 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, Changli Gao
The SPI isn't at the beginning of an AH message.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
net/core/dev.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index b7c5309..ba248f4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2266,7 +2266,7 @@ static inline void ____napi_schedule(struct softnet_data *sd,
*/
__u32 __skb_get_rxhash(struct sk_buff *skb)
{
- int nhoff, hash = 0;
+ int nhoff, hash = 0, poff;
struct ipv6hdr *ip6;
struct iphdr *ip;
u8 ip_proto;
@@ -2306,24 +2306,15 @@ __u32 __skb_get_rxhash(struct sk_buff *skb)
goto done;
}
- switch (ip_proto) {
- case IPPROTO_TCP:
- case IPPROTO_UDP:
- case IPPROTO_DCCP:
- case IPPROTO_ESP:
- case IPPROTO_AH:
- case IPPROTO_SCTP:
- case IPPROTO_UDPLITE:
- if (pskb_may_pull(skb, (ihl * 4) + 4 + nhoff)) {
- ports.v32 = * (__force u32 *) (skb->data + nhoff +
- (ihl * 4));
+ ports.v32 = 0;
+ poff = proto_ports_offset(ip_proto);
+ if (poff >= 0) {
+ nhoff += ihl * 4 + poff;
+ if (pskb_may_pull(skb, nhoff + 4)) {
+ ports.v32 = * (__force u32 *) (skb->data + nhoff);
if (ports.v16[1] < ports.v16[0])
swap(ports.v16[0], ports.v16[1]);
- break;
}
- default:
- ports.v32 = 0;
- break;
}
/* get a consistent hash (same value on both flow directions) */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/8] net: rps: use proto_ports_offset() to handle the AH message correctly
2010-08-18 5:04 [PATCH 4/8] net: rps: use proto_ports_offset() to handle the AH message correctly Changli Gao
@ 2010-08-20 0:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-08-20 0:16 UTC (permalink / raw)
To: xiaosuo; +Cc: netdev
From: Changli Gao <xiaosuo@gmail.com>
Date: Wed, 18 Aug 2010 13:04:32 +0800
> The SPI isn't at the beginning of an AH message.
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-20 0:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-18 5:04 [PATCH 4/8] net: rps: use proto_ports_offset() to handle the AH message correctly Changli Gao
2010-08-20 0:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).