[PATCH] core/addr: fix compilation warning {was Re: [openib-general] Latest build test results}

[Hal Rosenstock]

On Sat, 2005-10-15 at 12:56, Nishanth Aravamudan wrote:
> > Thanks for trying out these patches. Sorry for the manual intervention.
> 
> No problem; it unfortunately wasn't as simple as just editing the
> patches, as when I did so, all the hunks would fail. So I just
> regenerated them locally against current-git. Not a big deal, since
> these were small changes.
> 
> > I regenerated the patches for fib_frontend.c, at.c, and sdp_link.c and
> > they are in linux-kernel/patches. Hopefully these will work with your
> > automated build system. These are found in linux-kernel/patches as:
> > linux-2.6.14-rc3-at.diff
> > linux-2.6.14-rc3-fib-frontend.diff
> > linux-2.6.14-rc3-sdp_link.diff
> 
> Those look great and are identical to the ones I generated. So, my
> Acked-by applies to those 3.
> 
> > Dan will be checking in the iser.h fix. 
> 
> Ok, great!
> 
> I think the core/addr.c problem can be fixed with the following:
> 
> Thanks,
> Nish
> 
> Description: Fix a compilation warning in core/addr.c due to
> packet_type's func member changing prototype.
> 
> Signed-off-by: Nishanth Aravamudan <nacc at us.ibm.com>
> 
> ---
> 
> diff -urpN linux-2.6.14-rc4-git4-dev/drivers/infiniband/core/addr.c linux-2.6.14-rc4-git4-dev2/drivers/infiniband/core/addr.c
> --- linux-2.6.14-rc4-git4-dev/drivers/infiniband/core/addr.c	2005-10-15 09:52:26.000000000 -0700
> +++ linux-2.6.14-rc4-git4-dev2/drivers/infiniband/core/addr.c	2005-10-15 09:52:56.000000000 -0700
> @@ -310,7 +310,7 @@ void ib_addr_cancel(struct ib_addr *addr
>  EXPORT_SYMBOL(ib_addr_cancel);
>  
>  static int addr_arp_recv(struct sk_buff *skb, struct net_device *dev,
> -			 struct packet_type *pkt)
> +			 struct packet_type *pkt, struct net_device *orig_dev)
>  {
>  	struct arphdr *arp_hdr;

Thanks. I just added that one as
linux-kernel/patches/linux-2.6.14-rc3-addr.diff

-- Hal