diff --git a/[refs] b/[refs] index 22104212c637..630e7f74cfb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab55570d64d5409fa940e85dd8de2594b160f826 +refs/heads/master: deb28d9bc4bb6922c1f7e459744d7b2d0db3a1d2 diff --git a/trunk/net/802/fc.c b/trunk/net/802/fc.c index cb3475ea6fda..34cf1ee014b8 100644 --- a/trunk/net/802/fc.c +++ b/trunk/net/802/fc.c @@ -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;