From 8759b9e23b4d2ffc39d6d4832c2ca8956a6cb5a8 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 17 Jun 2008 19:27:55 -0400
Subject: [PATCH] --- yaml --- r: 98237 b: refs/heads/master c:
 8b8091fbf4d8791ad70b146ba2c892c62c2cdc6b h: refs/heads/master i:   98235:
 1a101a0b90cad6071a497d50c3d37253396e5682 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/ibm_newemac/Kconfig |  1 +
 trunk/drivers/net/tun.c               | 15 ---------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6a58dcea3c4a..7f86af20abbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f09f7ee20c867818bacf79426cf491b2749e7eff
+refs/heads/master: 8b8091fbf4d8791ad70b146ba2c892c62c2cdc6b
diff --git a/trunk/drivers/net/ibm_newemac/Kconfig b/trunk/drivers/net/ibm_newemac/Kconfig
index 0d3e7380bad0..70a3272ee998 100644
--- a/trunk/drivers/net/ibm_newemac/Kconfig
+++ b/trunk/drivers/net/ibm_newemac/Kconfig
@@ -1,6 +1,7 @@
 config IBM_NEW_EMAC
 	tristate "IBM EMAC Ethernet support"
 	depends on PPC_DCR && PPC_MERGE
+	select CRC32
 	help
 	  This driver supports the IBM EMAC family of Ethernet controllers
 	  typically found on 4xx embedded PowerPC chips, but also on the
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 7ab94c825b57..0ce07a339c7e 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -313,21 +313,6 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,
 
 	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;