diff --git a/[refs] b/[refs] index a76ce3e9d703..c014f0f9538e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afe62c68cd3562c5f8e3ea293e82906dd5a87936 +refs/heads/master: 31817df025e24559a01d33ddd68bd11b21bf9d7b diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index aa4c73afa19a..d2294ad1a895 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -456,6 +456,7 @@ static struct sock *fanout_demux_cpu(struct packet_fanout *f, struct sk_buff *sk static struct sk_buff *fanout_check_defrag(struct sk_buff *skb) { +#ifdef CONFIG_INET const struct iphdr *iph; u32 len; @@ -486,6 +487,7 @@ static struct sk_buff *fanout_check_defrag(struct sk_buff *skb) skb->rxhash = 0; } } +#endif return skb; }