Date: Mon, 2 Apr 2007 02:19:02 +0200 (CEST)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: eth1394: CONFIG_INET is always defined

because CONFIG_IEEE1394_ETH1394 depends on it.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/ieee1394/eth1394.c |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Index: foo/drivers/ieee1394/eth1394.c
===================================================================
--- foo.orig/drivers/ieee1394/eth1394.c
+++ foo/drivers/ieee1394/eth1394.c
@@ -711,21 +711,13 @@ static int ether1394_header(struct sk_bu
 static int ether1394_rebuild_header(struct sk_buff *skb)
 {
 	struct eth1394hdr *eth = (struct eth1394hdr *)skb->data;
-	struct net_device *dev = skb->dev;
-
-	switch (eth->h_proto) {
 
-#ifdef CONFIG_INET
-	case __constant_htons(ETH_P_IP):
+	if (eth->h_proto == htons(ETH_P_IP))
 		return arp_find((unsigned char *)&eth->h_dest, skb);
-#endif
-	default:
-		ETH1394_PRINT(KERN_DEBUG, dev->name,
-			      "unable to resolve type %04x addresses.\n",
-			      ntohs(eth->h_proto));
-		break;
-	}
 
+	ETH1394_PRINT(KERN_DEBUG, skb->dev->name,
+		      "unable to resolve type %04x addresses\n",
+		      ntohs(eth->h_proto));
 	return 0;
 }