diff options
| author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-07-22 07:13:12 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 08:23:19 +0200 |
| commit | c16d118537cadb21d186e35aebad90a13cd78846 (patch) | |
| tree | 8fc1ab697f2476ecd2b39522efcf6234be3dc5c0 /drivers/net/atp.c | |
| parent | dm9000: Support MAC address setting through platform data. (diff) | |
| download | linux-c16d118537cadb21d186e35aebad90a13cd78846.tar.xz linux-c16d118537cadb21d186e35aebad90a13cd78846.zip | |
[netdrvr] Drivers should not set IFF_* flag themselves
Some hardware set promisc when they are requested to set IFF_ALLMULTI flag.
It's ok, but if drivers set IFF_PROMISC flag when they set promisc,
it will broken upper layer handle for promisc and allmulti.
In addition, drivers can use their own hardware programming to make it.
So do not allow drivers to set IFF_* flags.
This is a general driver fix, so I didn't split it to pieces and send
to specific driver maintainers.
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/atp.c')
| -rw-r--r-- | drivers/net/atp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 3d4433358a36..c10cd8058e23 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c @@ -854,14 +854,9 @@ static void set_rx_mode_8002(struct net_device *dev) struct net_local *lp = netdev_priv(dev); long ioaddr = dev->base_addr; - if ( dev->mc_count > 0 || (dev->flags & (IFF_ALLMULTI|IFF_PROMISC))) { - /* We must make the kernel realise we had to move - * into promisc mode or we start all out war on - * the cable. - AC - */ - dev->flags|=IFF_PROMISC; + if (dev->mc_count > 0 || (dev->flags & (IFF_ALLMULTI|IFF_PROMISC))) lp->addr_mode = CMR2h_PROMISC; - } else + else lp->addr_mode = CMR2h_Normal; write_reg_high(ioaddr, CMR2, lp->addr_mode); } |