projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: bfin_mac: let boards set vlan masks
[deliverable/linux.git]
/
drivers
/
net
/
bfin_mac.c
diff --git
a/drivers/net/bfin_mac.c
b/drivers/net/bfin_mac.c
index e712be4a6433292ad7fe3a6d49386e615556bc91..0b9fc5173aef1478355e9cadbcb635f1fdca594d 100644
(file)
--- a/
drivers/net/bfin_mac.c
+++ b/
drivers/net/bfin_mac.c
@@
-588,6
+588,10
@@
static void setup_system_regs(struct net_device *dev)
bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
+ /* Set vlan regs to let 1522 bytes long packets pass through */
+ bfin_write_EMAC_VLAN1(lp->vlan1_mask);
+ bfin_write_EMAC_VLAN2(lp->vlan2_mask);
+
/* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0);
bfin_write_DMA2_X_MODIFY(4);
/* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0);
bfin_write_DMA2_X_MODIFY(4);
@@
-1520,6
+1524,9
@@
static int __devinit bfin_mac_probe(struct platform_device *pdev)
goto out_err_mii_probe;
}
goto out_err_mii_probe;
}
+ lp->vlan1_mask = ETH_P_8021Q | mii_bus_data->vlan1_mask;
+ lp->vlan2_mask = ETH_P_8021Q | mii_bus_data->vlan2_mask;
+
/* Fill in the fields of the device structure with ethernet values. */
ether_setup(ndev);
/* Fill in the fields of the device structure with ethernet values. */
ether_setup(ndev);
This page took
0.028305 seconds
and
5
git commands to generate.