Messages in this thread Patch in this message | | | Date | Sun, 13 Apr 2003 13:57:13 -0700 | From | Andrew Morton <> | Subject | Re: 2.5.67-mm2: multiple definition of `ipip_err' |
| |
Adrian Bunk <bunk@fs.tum.de> wrote: > > Besides the ipip_err that was already in net/ipv4/ipip.c there's now a > second one in net/ipv4/xfrm4_tunnel.c .
Seems pretty straightforward.
diff -puN net/ipv4/ipip.c~ipip_err-compile-fix net/ipv4/ipip.c --- 25/net/ipv4/ipip.c~ipip_err-compile-fix 2003-04-13 13:55:21.000000000 -0700 +++ 25-akpm/net/ipv4/ipip.c 2003-04-13 13:55:31.000000000 -0700 @@ -286,7 +286,7 @@ static void ipip_tunnel_uninit(struct ne dev_put(dev); } -void ipip_err(struct sk_buff *skb, void *__unused) +static void ipip_err(struct sk_buff *skb, void *__unused) { #ifndef I_WISH_WORLD_WERE_PERFECT diff -puN net/ipv4/xfrm4_tunnel.c~ipip_err-compile-fix net/ipv4/xfrm4_tunnel.c --- 25/net/ipv4/xfrm4_tunnel.c~ipip_err-compile-fix 2003-04-13 13:55:21.000000000 -0700 +++ 25-akpm/net/ipv4/xfrm4_tunnel.c 2003-04-13 13:55:35.000000000 -0700 @@ -163,7 +163,7 @@ out: return 0; } -void ipip_err(struct sk_buff *skb, u32 info) +static void ipip_err(struct sk_buff *skb, u32 info) { struct xfrm_tunnel *handler = ipip_handler; u32 arg = info; _
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |