diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-01-10 03:54:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-10 22:31:14 +0100 |
| commit | c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3 (patch) | |
| tree | 353f7dc0114794bb9b78ceae4c42c724ef0d10e2 /drivers/net/bfin_mac.c | |
| parent | netdev: bfin_mac: disable hardware checksum if writeback cache is enabled (diff) | |
| download | linux-c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3.tar.xz linux-c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3.zip | |
netdev: bfin_mac: let boards set vlan masks
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bfin_mac.c')
| -rw-r--r-- | drivers/net/bfin_mac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index e712be4a6433..0b9fc5173aef 100644 --- 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); + /* 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); @@ -1520,6 +1524,9 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) 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); |