From e6d87036412b952cb083eff2dc716aee97a771f2 Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Fri, 17 May 2013 20:40:24 +0300 Subject: Move to rsdk 3.2.4. Compiles cleanly. Signed-off-by: Roman Yeryomin --- .../linux/realtek/files/include/net/rtl/rtk_vlan.h | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'target/linux/realtek/files/include/net/rtl/rtk_vlan.h') diff --git a/target/linux/realtek/files/include/net/rtl/rtk_vlan.h b/target/linux/realtek/files/include/net/rtl/rtk_vlan.h index 71764b61f..0a7f16f36 100644 --- a/target/linux/realtek/files/include/net/rtl/rtk_vlan.h +++ b/target/linux/realtek/files/include/net/rtl/rtk_vlan.h @@ -10,12 +10,16 @@ struct vlan_info { int global_vlan; // 0/1 - global vlan disable/enable - int is_lan; // 1: eth-lan/wlan port, 0: wan port + int is_lan; // 1: eth-lan/wlan port, 0: wan port int vlan; // 0/1: disable/enable vlan int tag; // 0/1: disable/enable tagging int id; // 1~4090: vlan id int pri; // 0~7: priority; int cfi; // 0/1: cfi +#if defined(CONFIG_RTK_VLAN_NEW_FEATURE) + int forwarding_rule; // 0:disabled/1: bridge/2:NAT + int index; +#endif }; struct _vlan_tag { @@ -25,14 +29,28 @@ struct _vlan_tag { struct vlan_tag { union - { + { unsigned long v; struct _vlan_tag f; - }; + }; +}; + +#if defined(CONFIG_RTK_VLAN_NEW_FEATURE) +extern struct vlan_info management_vlan; +extern unsigned char lan_macaddr[6]; +struct vlan_info_item { + struct vlan_info info; + struct net_device *dev; }; +struct net_device *rtl_get_wan_from_vlan_info(void); +int rtl_add_vlan_info(struct vlan_info *info, struct net_device *dev); +struct vlan_info_item *rtl_get_vlan_info_item_by_dev(struct net_device *dev); + +#endif + #if defined(CONFIG_RTL_HW_STP) -uint32 rtl865x_getVlanPortMask(uint32 vid); +uint32 rtl865x_getVlanPortMask(uint32 vid); #endif #endif // _RTK_VLAN_H -- cgit v1.2.3