From fe2551bf8a2d64daa600174e07cae31e50633cec Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Thu, 18 Aug 2011 23:23:47 -0700
Subject: [PATCH] --- yaml --- r: 265335 b: refs/heads/master c:
 ae1511bf769cafeae5ab61aaf9947a16a22cbd10 h: refs/heads/master i:   265333:
 bde30019c50c51ec2cb7709647b494f533f4190f   265331:
 004ef54189d06dc8c6517394e94e39e21ab8bb52   265327:
 04c694ec732de95fca3f9a9bb01aae9d7aa07a2a v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc3c57660d11..c9d751fd68f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ff1986fc94ee711df3cf19d45f2abf351436a6d
+refs/heads/master: ae1511bf769cafeae5ab61aaf9947a16a22cbd10
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index be7ee506f17a..c2442b46646e 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -134,6 +134,7 @@
 #include <linux/inetdevice.h>
 #include <linux/cpu_rmap.h>
 #include <linux/if_tunnel.h>
+#include <linux/if_pppox.h>
 
 #include "net-sysfs.h"
 
@@ -2573,6 +2574,13 @@ void __skb_get_rxhash(struct sk_buff *skb)
 		proto = vlan->h_vlan_encapsulated_proto;
 		nhoff += sizeof(*vlan);
 		goto again;
+	case __constant_htons(ETH_P_PPP_SES):
+		if (!pskb_may_pull(skb, PPPOE_SES_HLEN + nhoff))
+			goto done;
+		proto = *((__be16 *) (skb->data + nhoff +
+				      sizeof(struct pppoe_hdr)));
+		nhoff += PPPOE_SES_HLEN;
+		goto again;
 	default:
 		goto done;
 	}