diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-04-01 20:19:02 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-04-29 18:00:31 -0400 |
commit | 599bba9647f7813c09bf921c72351609430c8a33 (patch) | |
tree | 6964819461d733743541462e4556c583681e3457 | |
parent | 17bab407d54ba1320d71a45641ecffc33bd331c1 (diff) |
ieee1394: eth1394: CONFIG_INET is always defined
because CONFIG_IEEE1394_ETH1394 depends on it.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r-- | 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 aee82922e6b7..2d226a383d49 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, | |||
711 | static int ether1394_rebuild_header(struct sk_buff *skb) | 711 | static int ether1394_rebuild_header(struct sk_buff *skb) |
712 | { | 712 | { |
713 | struct eth1394hdr *eth = (struct eth1394hdr *)skb->data; | 713 | struct eth1394hdr *eth = (struct eth1394hdr *)skb->data; |
714 | struct net_device *dev = skb->dev; | ||
715 | |||
716 | switch (eth->h_proto) { | ||
717 | 714 | ||
718 | #ifdef CONFIG_INET | 715 | if (eth->h_proto == htons(ETH_P_IP)) |
719 | case __constant_htons(ETH_P_IP): | ||
720 | return arp_find((unsigned char *)ð->h_dest, skb); | 716 | return arp_find((unsigned char *)ð->h_dest, skb); |
721 | #endif | ||
722 | default: | ||
723 | ETH1394_PRINT(KERN_DEBUG, dev->name, | ||
724 | "unable to resolve type %04x addresses.\n", | ||
725 | ntohs(eth->h_proto)); | ||
726 | break; | ||
727 | } | ||
728 | 717 | ||
718 | ETH1394_PRINT(KERN_DEBUG, skb->dev->name, | ||
719 | "unable to resolve type %04x addresses\n", | ||
720 | ntohs(eth->h_proto)); | ||
729 | return 0; | 721 | return 0; |
730 | } | 722 | } |
731 | 723 | ||