dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

net: rps: fix the support for PPPOE 

The upper protocol numbers of PPPOE are different, and should be treated
specially.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao 2011-09-20 22:36:07 +00:00 committed by David S. Miller
parent 16e5726269
commit 5dd17e08f3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/core/dev.c
View File

@ -135,6 +135,7 @@
#include <linux/cpu_rmap.h>
#include <linux/if_tunnel.h>
#include <linux/if_pppox.h>
#include <linux/ppp_defs.h>
#include "net-sysfs.h"
@ -2556,6 +2557,7 @@ void __skb_get_rxhash(struct sk_buff *skb)
again:
switch (proto) {
case __constant_htons(ETH_P_IP):
ip:
if (!pskb_may_pull(skb, sizeof(*ip) + nhoff))
goto done;
@ -2569,6 +2571,7 @@ again:
nhoff += ip->ihl * 4;
break;
case __constant_htons(ETH_P_IPV6):
ipv6:
if (!pskb_may_pull(skb, sizeof(*ip6) + nhoff))
goto done;
@ -2591,7 +2594,14 @@ again:
proto = *((__be16 *) (skb->data + nhoff +
sizeof(struct pppoe_hdr)));
nhoff += PPPOE_SES_HLEN;
goto again;
switch (proto) {
case __constant_htons(PPP_IP):
goto ip;
case __constant_htons(PPP_IPV6):
goto ipv6;
default:
goto done;
}
default:
goto done;
}