X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fgianfar.c;h=bf3aa275ef4ab60906323cc4e47783fbe106462a;hb=6aa20a2235535605db6d6d2bd850298b2fe7f31e;hp=5130da094305ed4e4a51ad41ce0efdd55c9268c0;hpb=7a291083225af6e22ffaa46b3d91cfc1a1ccaab4;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 5130da0..bf3aa27 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1063,7 +1063,7 @@ static void gfar_vlan_rx_register(struct net_device *dev, tempval |= TCTRL_VLINS; gfar_write(&priv->regs->tctrl, tempval); - + /* Enable VLAN tag extraction */ tempval = gfar_read(&priv->regs->rctrl); tempval |= RCTRL_VLEX; @@ -1718,7 +1718,7 @@ static void gfar_set_multi(struct net_device *dev) tempval &= ~(RCTRL_PROM); gfar_write(®s->rctrl, tempval); } - + if(dev->flags & IFF_ALLMULTI) { /* Set the hash to rx all multicast frames */ gfar_write(®s->igaddr0, 0xffffffff); @@ -1954,7 +1954,7 @@ static int __init gfar_init(void) if (err) gfar_mdio_exit(); - + return err; }