Re: linux-next: Tree for July 7 (net/af_packet)

[David Miller <davem@davemloft.net>]

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 7 Jul 2011 08:12:02 -0700

> On Thu, 7 Jul 2011 17:25:44 +1000 Stephen Rothwell wrote:
> 
>> Hi all,
>> 
>> The next linux-next release will (probably) be next-20110718.
>> 
>> Changes since 20110706:
> 
> 
> When CONFIG_INET is not enabled:
> 
> af_packet.c:(.text+0x3d130): undefined reference to `ip_defrag'
> or
> ERROR: "ip_defrag" [net/packet/af_packet.ko] undefined!

Sorry about that, fixed thusly:

--------------------
packet: Fix build with INET disabled.

af_packet.c:(.text+0x3d130): undefined reference to `ip_defrag'
or
ERROR: "ip_defrag" [net/packet/af_packet.ko] undefined!

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/packet/af_packet.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index aa4c73a..d2294ad 100644
--- a/net/packet/af_packet.c
+++ b/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;
 }
 
-- 
1.7.6