Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[mv-sheeva.git] / net / 802 / fc.c

diff --git a/net/802/fc.c b/net/802/fc.c
index cb3475ea6fdada58337e7bf6e39773478afb0b7b..1e49f2d4ea9624e804ae0588d96976e32430bc9a 100644 (file)
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -70,7 +70,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
        if(daddr)
        {
                memcpy(fch->daddr,daddr,dev->addr_len);
-               return(hdr_len);
+               return hdr_len;
        }
        return -hdr_len;
 }
@@ -82,13 +82,13 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev,
 
 static int fc_rebuild_header(struct sk_buff *skb)
 {
+#ifdef CONFIG_INET
        struct fch_hdr *fch=(struct fch_hdr *)skb->data;
        struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
        if(fcllc->ethertype != htons(ETH_P_IP)) {
                printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(fcllc->ethertype));
                return 0;
        }
-#ifdef CONFIG_INET
        return arp_find(fch->daddr, skb);
 #else
        return 0;