aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5130da094305..bf3aa275ef4a 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,
1063 tempval |= TCTRL_VLINS; 1063 tempval |= TCTRL_VLINS;
1064 1064
1065 gfar_write(&priv->regs->tctrl, tempval); 1065 gfar_write(&priv->regs->tctrl, tempval);
1066 1066
1067 /* Enable VLAN tag extraction */ 1067 /* Enable VLAN tag extraction */
1068 tempval = gfar_read(&priv->regs->rctrl); 1068 tempval = gfar_read(&priv->regs->rctrl);
1069 tempval |= RCTRL_VLEX; 1069 tempval |= RCTRL_VLEX;
@@ -1718,7 +1718,7 @@ static void gfar_set_multi(struct net_device *dev)
1718 tempval &= ~(RCTRL_PROM); 1718 tempval &= ~(RCTRL_PROM);
1719 gfar_write(&regs->rctrl, tempval); 1719 gfar_write(&regs->rctrl, tempval);
1720 } 1720 }
1721 1721
1722 if(dev->flags & IFF_ALLMULTI) { 1722 if(dev->flags & IFF_ALLMULTI) {
1723 /* Set the hash to rx all multicast frames */ 1723 /* Set the hash to rx all multicast frames */
1724 gfar_write(&regs->igaddr0, 0xffffffff); 1724 gfar_write(&regs->igaddr0, 0xffffffff);
@@ -1954,7 +1954,7 @@ static int __init gfar_init(void)
1954 1954
1955 if (err) 1955 if (err)
1956 gfar_mdio_exit(); 1956 gfar_mdio_exit();
1957 1957
1958 return err; 1958 return err;
1959} 1959}
1960 1960