[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tkrat.be2ddb1e91e2f590@s5r6.in-berlin.de>
Date: Mon, 2 Apr 2007 02:19:02 +0200 (CEST)
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: linux1394-devel@...ts.sourceforge.net
cc: netdev@...r.kernel.org
Subject: [PATCH linux1394-2.6.git 08/15] eth1394: CONFIG_INET is always
defined
because CONFIG_IEEE1394_ETH1394 depends on it.
Signed-off-by: Stefan Richter <stefanr@...6.in-berlin.de>
---
drivers/ieee1394/eth1394.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
Index: linux/drivers/ieee1394/eth1394.c
===================================================================
--- linux.orig/drivers/ieee1394/eth1394.c
+++ linux/drivers/ieee1394/eth1394.c
@@ -715,21 +715,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 *)ð->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;
}
--
Stefan Richter
-=====-=-=== -=-- ---=-
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists