From f62e15a6bc782ca2803c1b04258677324a2b98b3 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 26 Mar 2008 00:16:29 -0700 Subject: [PATCH] --- yaml --- r: 87836 b: refs/heads/master c: f70c176619dde7f32283fc5c94df8e9aaac12729 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/net_kern.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index de5949f5fd7d..b736ed4e150c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ed21b321a13421e2dfeaa70a6c324e05e3e91e6 +refs/heads/master: f70c176619dde7f32283fc5c94df8e9aaac12729 diff --git a/trunk/arch/um/drivers/net_kern.c b/trunk/arch/um/drivers/net_kern.c index 1e8f41a99511..1d43bdfc20c4 100644 --- a/trunk/arch/um/drivers/net_kern.c +++ b/trunk/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)