---

yaml --- r: 265335 b: refs/heads/master c: ae1511b h: refs/heads/master i: 265333: bde3001 265331: 004ef54 265327: 04c694e v: v3
git-mirror · Aug 19, 2011 · fe2551b · fe2551b
1 parent 93f14c2
commit fe2551b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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;
 	}