UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mike Frysinger 2011-01-10 02:54:32 +00:00 committed by David S. Miller
parent 2d70a3d42d
commit c599bd6b9a
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bfin_mac.c
View File

@ -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 */ /* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0); bfin_write_DMA2_X_COUNT(0);
bfin_write_DMA2_X_MODIFY(4); 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. */ /* Fill in the fields of the device structure with ethernet values. */
ether_setup(ndev); ether_setup(ndev);

3
drivers/net/bfin_mac.h
View File

@ -82,6 +82,9 @@ struct bfin_mac_local {
struct timer_list tx_reclaim_timer; struct timer_list tx_reclaim_timer;
struct net_device *ndev; struct net_device *ndev;
/* Data for EMAC_VLAN1 regs */
u16 vlan1_mask, vlan2_mask;
/* MII and PHY stuffs */ /* MII and PHY stuffs */
int old_link; /* used by bf537_adjust_link */ int old_link; /* used by bf537_adjust_link */
int old_speed; int old_speed;

1
include/linux/bfin_mac.h
View File

@ -24,6 +24,7 @@ struct bfin_mii_bus_platform_data {
const unsigned short *mac_peripherals; const unsigned short *mac_peripherals;
int phy_mode; int phy_mode;
unsigned int phy_mask; unsigned int phy_mask;
unsigned short vlan1_mask, vlan2_mask;
}; };
#endif #endif