Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c599bd6b authored by Mike Frysinger's avatar Mike Frysinger Committed by David S. Miller
Browse files

netdev: bfin_mac: let boards set vlan masks 



Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d70a3d4

drivers/net/bfin_mac.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/bfin_mac.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ struct bfin_mac_local { 
	struct timer_list tx_reclaim_timer;

	struct net_device *ndev;



	/* Data for EMAC_VLAN1 regs */

	u16 vlan1_mask, vlan2_mask;



	/* MII and PHY stuffs */

	int old_link;          /* used by bf537_adjust_link */

	int old_speed;

include/linux/bfin_mac.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct bfin_mii_bus_platform_data { 
	const unsigned short *mac_peripherals;

	int phy_mode;

	unsigned int phy_mask;

	unsigned short vlan1_mask, vlan2_mask;

};



#endif