hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: rtl8366rb: use the generic get_port_link implementation 

SVN-Revision: 30842
owl
Gabor Juhos 2012-03-07 16:32:37 +00:00
parent c455a0f7be
commit e2f0264afe
1 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
target/linux/generic/files/drivers/net/phy/rtl8366rb.c
View File

@ -681,59 +681,47 @@ static int rtl8366rb_sw_set_learning_enable(struct switch_dev *dev,
return 0; return 0;
} }
static const char *rtl8366rb_speed_str(unsigned speed)
{
switch (speed) {
case 0:
return "10baseT";
case 1:
return "100baseT";
case 2:
return "1000baseT";
}
return "unknown";
}
static int rtl8366rb_sw_get_port_link(struct switch_dev *dev, static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
const struct switch_attr *attr, int port,
struct switch_val *val) struct switch_port_link *link)
{ {
struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev); struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
u32 len = 0, data = 0; u32 data = 0;
u32 speed;
if (val->port_vlan >= RTL8366RB_NUM_PORTS) if (port >= RTL8366RB_NUM_PORTS)
return -EINVAL; return -EINVAL;
memset(smi->buf, '\0', sizeof(smi->buf)); rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + (port / 2),
rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + &data);
(val->port_vlan / 2), &data);
if (val->port_vlan % 2) if (port % 2)
data = data >> 8; data = data >> 8;
if (data & RTL8366RB_PORT_STATUS_LINK_MASK) { link->link = !!(data & RTL8366RB_PORT_STATUS_LINK_MASK);
len = snprintf(smi->buf, sizeof(smi->buf), if (!link->link)
"port:%d link:up speed:%s %s-duplex %s%s%s", return 0;
val->port_vlan,
rtl8366rb_speed_str(data &
RTL8366RB_PORT_STATUS_SPEED_MASK),
(data & RTL8366RB_PORT_STATUS_DUPLEX_MASK) ?
"full" : "half",
(data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK) ?
"tx-pause ": "",
(data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK) ?
"rx-pause " : "",
(data & RTL8366RB_PORT_STATUS_AN_MASK) ?
"nway ": "");
} else {
len = snprintf(smi->buf, sizeof(smi->buf), "port:%d link: down",
val->port_vlan);
}
val->value.s = smi->buf; link->duplex = !!(data & RTL8366RB_PORT_STATUS_DUPLEX_MASK);
val->len = len; link->rx_flow = !!(data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK);
link->tx_flow = !!(data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK);
link->aneg = !!(data & RTL8366RB_PORT_STATUS_AN_MASK);
speed = (data & RTL8366RB_PORT_STATUS_SPEED_MASK);
switch (speed) {
case 0:
link->speed = SWITCH_PORT_SPEED_10;
break;
case 1:
link->speed = SWITCH_PORT_SPEED_100;
break;
case 2:
link->speed = SWITCH_PORT_SPEED_1000;
break;
default:
link->speed = SWITCH_PORT_SPEED_UNKNOWN;
break;
}
return 0; return 0;
} }
@ -1018,13 +1006,6 @@ static struct switch_attr rtl8366rb_globals[] = {
static struct switch_attr rtl8366rb_port[] = { static struct switch_attr rtl8366rb_port[] = {
{ {
.type = SWITCH_TYPE_STRING,
.name = "link",
.description = "Get port link information",
.max = 1,
.set = NULL,
.get = rtl8366rb_sw_get_port_link,
}, {
.type = SWITCH_TYPE_NOVAL, .type = SWITCH_TYPE_NOVAL,
.name = "reset_mib", .name = "reset_mib",
.description = "Reset single port MIB counters", .description = "Reset single port MIB counters",
@ -1104,6 +1085,7 @@ static const struct switch_dev_ops rtl8366_ops = {
.get_port_pvid = rtl8366_sw_get_port_pvid, .get_port_pvid = rtl8366_sw_get_port_pvid,
.set_port_pvid = rtl8366_sw_set_port_pvid, .set_port_pvid = rtl8366_sw_set_port_pvid,
.reset_switch = rtl8366rb_sw_reset_switch, .reset_switch = rtl8366rb_sw_reset_switch,
.get_port_link = rtl8366rb_sw_get_port_link,
}; };
static int rtl8366rb_switch_init(struct rtl8366_smi *smi) static int rtl8366rb_switch_init(struct rtl8366_smi *smi)