commit 4552e1198a08198ce0b42e856845b5394c82c59c
author David S. Miller <davem@davemloft.net> Tue Jun 17 21:32:08 2008 -0700
committer David S. Miller <davem@davemloft.net> Tue Jun 17 21:32:08 2008 -0700
tree 1e89b580a7a7f06d3765e50ef4ba642e37b06b4f
parent f09f7ee20c867818bacf79426cf491b2749e7eff
parent 58c7821c4264a7ddd6f0c31c5caaf393b3897f10

Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

drivers/net/tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 0ce07a3..7ab94c8 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -313,6 +313,21 @@
 
 	switch (tun->flags & TUN_TYPE_MASK) {
 	case TUN_TUN_DEV:
+		if (tun->flags & TUN_NO_PI) {
+			switch (skb->data[0] & 0xf0) {
+			case 0x40:
+				pi.proto = htons(ETH_P_IP);
+				break;
+			case 0x60:
+				pi.proto = htons(ETH_P_IPV6);
+				break;
+			default:
+				tun->dev->stats.rx_dropped++;
+				kfree_skb(skb);
+				return -EINVAL;
+			}
+		}
+
 		skb_reset_mac_header(skb);
 		skb->protocol = pi.proto;
 		skb->dev = tun->dev;