Title: [6023] trunk/drivers/net/bfin_mac.c: Minor change, always fill EMAC_VLAN1 register with 0x8100
- Revision
- 6023
- Author
- gyang
- Date
- 2009-01-15 01:51:56 -0600 (Thu, 15 Jan 2009)
Log Message
Minor change, always fill EMAC_VLAN1 register with 0x8100
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (6022 => 6023)
--- trunk/drivers/net/bfin_mac.c 2009-01-15 05:23:49 UTC (rev 6022)
+++ trunk/drivers/net/bfin_mac.c 2009-01-15 07:51:56 UTC (rev 6023)
@@ -517,13 +517,10 @@
bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define VLAN_ETHER_TYPE 0x8100
/* The legal length of the frame is increased to 1522 bytes */
- bfin_write_EMAC_VLAN1(VLAN_ETHER_TYPE);
- /* The legal length of the frame is increased to 1538 bytes */
- /*bfin_write_EMAC_VLAN2(VLAN_ETHER_TYPE);*/
-#endif
+ bfin_write_EMAC_VLAN1(ETH_P_8021Q);
+ /* Frame length is increased to 1538 bytes, for future use? */
+ /* bfin_write_EMAC_VLAN2( ?? ); */
/* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
