[UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1160 bytes --]

commit 00237037726efc587d55d65d6fd5357106ae7071
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed Mar 26 06:41:22 2008 +0100

    [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list
    
    IFF_ALLMULTI is an indication from the network stack to the driver
    to disable multicast filters, drivers should never set it directly.
    
    Since the UML networking device doesn't have any filtering capabilites,
    it doesn't the set_multicast_list function at all, it is kept so userspace
    can still issue SIOCADDMULTI/SIOCDELMULTI ioctls however.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 1e8f41a..1d43bdf 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -256,11 +256,7 @@ static struct net_device_stats *uml_net_get_stats(struct net_device *dev)
 
 static void uml_net_set_multicast_list(struct net_device *dev)
 {
-	if (dev->flags & IFF_PROMISC)
-		return;
-	else if (dev->mc_count)
-		dev->flags |= IFF_ALLMULTI;
-	else dev->flags &= ~IFF_ALLMULTI;
+	return;
 }
 
 static void uml_net_tx_timeout(struct net_device *dev)

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Jeff Garzik]

>  static void uml_net_set_multicast_list(struct net_device *dev)
>  {
> -	if (dev->flags & IFF_PROMISC)
> -		return;
> -	else if (dev->mc_count)
> -		dev->flags |= IFF_ALLMULTI;
> -	else dev->flags &= ~IFF_ALLMULTI;
> +	return;
>  }



Might as well just delete the hook at that point...

	Jeff

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Patrick McHardy]

Jeff Garzik wrote:
>>  static void uml_net_set_multicast_list(struct net_device *dev)
>>  {
>> -    if (dev->flags & IFF_PROMISC)
>> -        return;
>> -    else if (dev->mc_count)
>> -        dev->flags |= IFF_ALLMULTI;
>> -    else dev->flags &= ~IFF_ALLMULTI;
>> +    return;
>>  }
> 
> 
> 
> Might as well just delete the hook at that point...


I kept it so SIOCADDMULTI/SIOCDELMULTI ioctls continue to
work on UML devices. I don't know if any userspace applications
check for errors when using these ioctls, this way nothing
can break.

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Wed, 26 Mar 2008 07:13:51 +0100

> Jeff Garzik wrote:
> >>  static void uml_net_set_multicast_list(struct net_device *dev)
> >>  {
> >> -    if (dev->flags & IFF_PROMISC)
> >> -        return;
> >> -    else if (dev->mc_count)
> >> -        dev->flags |= IFF_ALLMULTI;
> >> -    else dev->flags &= ~IFF_ALLMULTI;
> >> +    return;
> >>  }
> > 
> > 
> > 
> > Might as well just delete the hook at that point...
> 
> 
> I kept it so SIOCADDMULTI/SIOCDELMULTI ioctls continue to
> work on UML devices. I don't know if any userspace applications
> check for errors when using these ioctls, this way nothing
> can break.

Good idea, patch applied to net-2.6, thanks!

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Jeff Dike]

On Wed, Mar 26, 2008 at 06:46:25AM +0100, Patrick McHardy wrote:
>     [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

I don't really understand this, but the people who do seem to like it,
so I'll drop it in my tree and forward it along if no one else does.

   	     	Jeff

-- 
Work email - jdike at linux dot intel dot com

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Patrick McHardy]

Jeff Dike wrote:
> On Wed, Mar 26, 2008 at 06:46:25AM +0100, Patrick McHardy wrote:
>>     [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list
> 
> I don't really understand this, but the people who do seem to like it,
> so I'll drop it in my tree and forward it along if no one else does.

Thanks, its already in Linus' tree.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace

Re: [UML]: uml-net: don't set IFF_ALLMULTI in set_multicast_list

[Jeff Dike]

On Mon, Mar 31, 2008 at 07:46:07PM +0200, Patrick McHardy wrote:
> Thanks, its already in Linus' tree.

Excellent...

	Jeff

-- 
Work email - jdike at linux dot intel dot com