Index: target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
===================================================================
--- target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c	(revisione 26868)
+++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c	(copia locale)
@@ -145,8 +145,8 @@
 	ar71xx_eth1_data.mac_addr[0] |= 0x02;
 }
 
-#define UBNT_RS_WAN_PHYMASK	(1 << 20)
-#define UBNT_RS_LAN_PHYMASK	((1 << 16) | (1 << 17) | (1 << 18) | (1 << 19))
+#define UBNT_RS_WAN_PHYMASK	BIT(20)
+#define UBNT_RS_LAN_PHYMASK	(BIT(16) | BIT(17) | BIT(18) | BIT(19))
 
 static void __init ubnt_rs_setup(void)
 {
@@ -175,8 +175,8 @@
 MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
 	     ubnt_rs_setup);
 
-#define UBNT_RSPRO_WAN_PHYMASK	(1 << 4)
-#define UBNT_RSPRO_LAN_PHYMASK	((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
+#define UBNT_RSPRO_WAN_PHYMASK	BIT(4)
+#define UBNT_RSPRO_LAN_PHYMASK	(BIT(0) | BIT(1) | BIT(2) | BIT(3))
 
 static void __init ubnt_rspro_setup(void)
 {
@@ -214,7 +214,7 @@
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSX, "UBNT-LSX", "Ubiquiti LSX", ubnt_lsx_setup);
 
-#define UBNT_LSSR71_PHY_MASK	(1 << 1)
+#define UBNT_LSSR71_PHY_MASK	BIT(1)
 
 static void __init ubnt_lssr71_setup(void)
 {
@@ -235,6 +235,9 @@
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
 	     ubnt_lssr71_setup);
 
+#define UBNT_M_WAN_PHYMASK	BIT(4)
+#define UBNT_M_LAN_PHYMASK	BIT(0)
+
 static void __init ubnt_m_setup(void)
 {
 	u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -243,13 +246,14 @@
 
 	ar71xx_add_device_m25p80(NULL);
 
-	ar71xx_add_device_mdio(~0);
+	ar71xx_add_device_mdio(~(UBNT_M_WAN_PHYMASK | UBNT_M_LAN_PHYMASK));
 
 	ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
 	ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
-	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth0_data.speed = SPEED_100;
 	ar71xx_eth0_data.duplex = DUPLEX_FULL;
+	ar71xx_eth0_data.phy_mask = UBNT_M_WAN_PHYMASK;
 
 	ar71xx_add_device_eth(0);
 
@@ -284,6 +288,7 @@
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth1_data.speed = SPEED_1000;
 	ar71xx_eth1_data.duplex = DUPLEX_FULL;
+	ar71xx_eth1_data.phy_mask = UBNT_M_LAN_PHYMASK;
 
 	ar71xx_add_device_eth(1);
 }
Index: target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
===================================================================
--- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h	(revisione 26868)
+++ target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h	(copia locale)
@@ -25,6 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/ethtool.h>
 #include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
 #include <linux/phy.h>
 #include <linux/skbuff.h>
 #include <linux/dma-mapping.h>
@@ -35,10 +36,8 @@
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/platform.h>
 
-#define ETH_FCS_LEN	4
-
 #define AG71XX_DRV_NAME		"ag71xx"
-#define AG71XX_DRV_VERSION	"0.5.35"
+#define AG71XX_DRV_VERSION	"0.5.36"
 
 #define AG71XX_NAPI_WEIGHT	64
 #define AG71XX_OOM_REFILL	(1 + HZ/10)
@@ -54,7 +53,7 @@
 #define AG71XX_TX_MTU_LEN	1540
 #define AG71XX_RX_PKT_RESERVE	64
 #define AG71XX_RX_PKT_SIZE	\
-	(AG71XX_RX_PKT_RESERVE + ETH_HLEN + ETH_FRAME_LEN + ETH_FCS_LEN)
+	(AG71XX_RX_PKT_RESERVE + ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
 
 #define AG71XX_TX_RING_SIZE	64
 #define AG71XX_TX_THRES_STOP	(AG71XX_TX_RING_SIZE - 4)