ieee1394: eth1394: CONFIG_INET is always defined

[Linux Kernel Mailing List]

Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=599bba9647f7813c09bf921c72351609430c8a33
Commit:     599bba9647f7813c09bf921c72351609430c8a33
Parent:     17bab407d54ba1320d71a45641ecffc33bd331c1
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 2 02:19:02 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:31 2007 +0200

    ieee1394: eth1394: CONFIG_INET is always defined
    
    because CONFIG_IEEE1394_ETH1394 depends on it.
    
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/ieee1394/eth1394.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index aee8292..2d226a3 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -711,21 +711,13 @@ static int ether1394_header(struct sk_buff *skb, struct 
net_device *dev,
 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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html