diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-06-28 17:24:05 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-06-28 17:24:05 +0000 |
| commit | 19842ab5da93cef22bab3b97a14cc35fe076b22b (patch) | |
| tree | 5b1853c0bb9cf89aedb9fd623ef70646a8a57a3e /target/linux/generic/files/drivers/net/phy/rtl8366s.c | |
| parent | f10a8dfb535919f1d8094ac0422bfe7d9d50f39e (diff) | |
| download | upstream-19842ab5da93cef22bab3b97a14cc35fe076b22b.tar.gz upstream-19842ab5da93cef22bab3b97a14cc35fe076b22b.tar.bz2 upstream-19842ab5da93cef22bab3b97a14cc35fe076b22b.zip | |
generic: rtl8366: minor cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21985 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/drivers/net/phy/rtl8366s.c')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/rtl8366s.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index f0d394065c..91030ac48e 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -27,9 +27,6 @@ #define RTL8366S_PHY_PAGE_MAX 7 #define RTL8366S_PHY_ADDR_MAX 31 -#define RTL8366S_CHIP_GLOBAL_CTRL_REG 0x0000 -#define RTL8366S_CHIP_CTRL_VLAN (1 << 13) - /* Switch Global Configuration register */ #define RTL8366S_SGCR 0x0000 #define RTL8366S_SGCR_EN_BC_STORM_CTRL BIT(0) @@ -39,6 +36,7 @@ #define RTL8366S_SGCR_MAX_LENGTH_1536 RTL8366S_SGCR_MAX_LENGTH(0x1) #define RTL8366S_SGCR_MAX_LENGTH_1552 RTL8366S_SGCR_MAX_LENGTH(0x2) #define RTL8366S_SGCR_MAX_LENGTH_16000 RTL8366S_SGCR_MAX_LENGTH(0x3) +#define RTL8366S_SGCR_EN_VLAN BIT(13) /* Port Enable Control register */ #define RTL8366S_PECR 0x0001 @@ -644,9 +642,8 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index) static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable) { - return rtl8366_smi_rmwr(smi, RTL8366S_CHIP_GLOBAL_CTRL_REG, - RTL8366S_CHIP_CTRL_VLAN, - (enable) ? RTL8366S_CHIP_CTRL_VLAN : 0); + return rtl8366_smi_rmwr(smi, RTL8366S_SGCR, RTL8366S_SGCR_EN_VLAN, + (enable) ? RTL8366S_SGCR_EN_VLAN : 0); } static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable) @@ -676,9 +673,9 @@ static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev, u32 data; if (attr->ofs == 1) { - rtl8366_smi_read_reg(smi, RTL8366S_CHIP_GLOBAL_CTRL_REG, &data); + rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data); - if (data & RTL8366S_CHIP_CTRL_VLAN) + if (data & RTL8366S_SGCR_EN_VLAN) val->value.i = 1; else val->value.i = 0; |