* Re: linux-next: Tree for July 7 (net/af_packet)
[not found] <20110707172544.867b980a1196db005b577c14@canb.auug.org.au>
@ 2011-07-07 15:12 ` Randy Dunlap
2011-07-07 15:18 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2011-07-07 15:12 UTC (permalink / raw)
To: Stephen Rothwell, netdev; +Cc: linux-next, LKML
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!
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: Tree for July 7 (net/af_packet)
2011-07-07 15:12 ` linux-next: Tree for July 7 (net/af_packet) Randy Dunlap
@ 2011-07-07 15:18 ` David Miller
2011-07-07 15:40 ` Randy Dunlap
2011-07-07 17:06 ` Mike Frysinger
0 siblings, 2 replies; 4+ messages in thread
From: David Miller @ 2011-07-07 15:18 UTC (permalink / raw)
To: randy.dunlap; +Cc: sfr, netdev, linux-next, linux-kernel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: Tree for July 7 (net/af_packet)
2011-07-07 15:18 ` David Miller
@ 2011-07-07 15:40 ` Randy Dunlap
2011-07-07 17:06 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2011-07-07 15:40 UTC (permalink / raw)
To: David Miller; +Cc: sfr, netdev, linux-next, linux-kernel
On Thu, 07 Jul 2011 08:18:39 -0700 (PDT) David Miller wrote:
> 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>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks.
> ---
> 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;
> }
>
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: Tree for July 7 (net/af_packet)
2011-07-07 15:18 ` David Miller
2011-07-07 15:40 ` Randy Dunlap
@ 2011-07-07 17:06 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2011-07-07 17:06 UTC (permalink / raw)
To: David Miller; +Cc: randy.dunlap, sfr, netdev, linux-next, linux-kernel
On Thu, Jul 7, 2011 at 11:18, David Miller wrote:
> 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!
fixes some Blackfin boards too.
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-07 17:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20110707172544.867b980a1196db005b577c14@canb.auug.org.au>
2011-07-07 15:12 ` linux-next: Tree for July 7 (net/af_packet) Randy Dunlap
2011-07-07 15:18 ` David Miller
2011-07-07 15:40 ` Randy Dunlap
2011-07-07 17:06 ` Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox