Re: [Mac-on-linux-devel] [PATCH] Sheep driver fixes for 2.6.35

[Alexander G. <ag...@su...>]

Please add a patch description and signed-off-by line, so I can easily apply it. Same goes for the other patch.

Alex

On 17.10.2010, at 12:37, Andreas Schwab wrote:

> ---
> src/netdriver/sheep.c |    8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/src/netdriver/sheep.c b/src/netdriver/sheep.c
> index 148acae..48e88c2 100644
> --- a/src/netdriver/sheep.c
> +++ b/src/netdriver/sheep.c
> @@ -610,7 +610,11 @@ error:
> 			return -ENODEV;
> 		if( copy_from_user(addr, (void *)arg, 6))
> 			return -EFAULT;
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
> +		ret = dev_mc_add(v->ether, addr);
> +#else
> 		ret = dev_mc_add(v->ether, addr, 6, 0);
> +#endif
> 		return ret;
> 	}
> 
> @@ -622,7 +626,11 @@ error:
> 			return -ENODEV;
> 		if( copy_from_user(addr, (void *)arg, 6))
> 			return -EFAULT;
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
> +		return dev_mc_del(v->ether, addr);
> +#else
> 		return dev_mc_delete(v->ether, addr, 6, 0);
> +#endif
> 	}
> 
> #if 0
> -- 
> 1.7.3.1
> 
> -- 
> Andreas Schwab, sc...@li...
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."
> 
> ------------------------------------------------------------------------------
> Download new Adobe(R) Flash(R) Builder(TM) 4
> The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
> Flex(R) Builder(TM)) enable the development of rich applications that run
> across multiple browsers and platforms. Download your free trials today!
> http://p.sf.net/sfu/adobe-dev2dev
> _______________________________________________
> Mac-on-linux-devel mailing list
> Mac...@li...
> https://lists.sourceforge.net/lists/listinfo/mac-on-linux-devel