|
|
@ -679,14 +679,14 @@ static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, |
|
|
|
int i; |
|
|
|
int i; |
|
|
|
|
|
|
|
|
|
|
|
/* Update the 4K table */ |
|
|
|
/* Update the 4K table */ |
|
|
|
err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
err = smi->ops->get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
vlan4k.member = member; |
|
|
|
vlan4k.member = member; |
|
|
|
vlan4k.untag = untag; |
|
|
|
vlan4k.untag = untag; |
|
|
|
vlan4k.fid = fid; |
|
|
|
vlan4k.fid = fid; |
|
|
|
err = rtl8366rb_set_vlan_4k(smi, &vlan4k); |
|
|
|
err = smi->ops->set_vlan_4k(smi, &vlan4k); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -694,7 +694,7 @@ static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
struct rtl8366_vlan_mc vlanmc; |
|
|
|
struct rtl8366_vlan_mc vlanmc; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->get_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -704,7 +704,7 @@ static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member, |
|
|
|
vlanmc.untag = untag; |
|
|
|
vlanmc.untag = untag; |
|
|
|
vlanmc.fid = fid; |
|
|
|
vlanmc.fid = fid; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->set_vlan_mc(smi, i, &vlanmc); |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -718,11 +718,11 @@ static int rtl8366rb_get_pvid(struct rtl8366_smi *smi, int port, int *val) |
|
|
|
int err; |
|
|
|
int err; |
|
|
|
int index; |
|
|
|
int index; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_get_mc_index(smi, port, &index); |
|
|
|
err = smi->ops->get_mc_index(smi, port, &index); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_get_vlan_mc(smi, index, &vlanmc); |
|
|
|
err = smi->ops->get_vlan_mc(smi, index, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -740,7 +740,7 @@ static int rtl8366rb_mc_is_used(struct rtl8366_smi *smi, int mc_index, |
|
|
|
for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { |
|
|
|
for (i = 0; i < RTL8366RB_NUM_PORTS; i++) { |
|
|
|
int index = 0; |
|
|
|
int index = 0; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_get_mc_index(smi, i, &index); |
|
|
|
err = smi->ops->get_mc_index(smi, i, &index); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -763,29 +763,29 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, |
|
|
|
|
|
|
|
|
|
|
|
/* Try to find an existing MC entry for this VID */ |
|
|
|
/* Try to find an existing MC entry for this VID */ |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->get_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
if (vid == vlanmc.vid) { |
|
|
|
if (vid == vlanmc.vid) { |
|
|
|
err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->set_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_set_mc_index(smi, port, i); |
|
|
|
err = smi->ops->set_mc_index(smi, port, i); |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* We have no MC entry for this VID, try to find an empty one */ |
|
|
|
/* We have no MC entry for this VID, try to find an empty one */ |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->get_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
if (vlanmc.vid == 0 && vlanmc.member == 0) { |
|
|
|
if (vlanmc.vid == 0 && vlanmc.member == 0) { |
|
|
|
/* Update the entry from the 4K table */ |
|
|
|
/* Update the entry from the 4K table */ |
|
|
|
err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
err = smi->ops->get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -793,11 +793,11 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, |
|
|
|
vlanmc.member = vlan4k.member; |
|
|
|
vlanmc.member = vlan4k.member; |
|
|
|
vlanmc.untag = vlan4k.untag; |
|
|
|
vlanmc.untag = vlan4k.untag; |
|
|
|
vlanmc.fid = vlan4k.fid; |
|
|
|
vlanmc.fid = vlan4k.fid; |
|
|
|
err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->set_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_set_mc_index(smi, port, i); |
|
|
|
err = smi->ops->set_mc_index(smi, port, i); |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -812,7 +812,7 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, |
|
|
|
|
|
|
|
|
|
|
|
if (!used) { |
|
|
|
if (!used) { |
|
|
|
/* Update the entry from the 4K table */ |
|
|
|
/* Update the entry from the 4K table */ |
|
|
|
err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
err = smi->ops->get_vlan_4k(smi, vid, &vlan4k); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
@ -820,11 +820,11 @@ static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port, |
|
|
|
vlanmc.member = vlan4k.member; |
|
|
|
vlanmc.member = vlan4k.member; |
|
|
|
vlanmc.untag = vlan4k.untag; |
|
|
|
vlanmc.untag = vlan4k.untag; |
|
|
|
vlanmc.fid = vlan4k.fid; |
|
|
|
vlanmc.fid = vlan4k.fid; |
|
|
|
err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->set_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
|
|
|
|
|
|
|
|
err = rtl8366rb_set_mc_index(smi, port, i); |
|
|
|
err = smi->ops->set_mc_index(smi, port, i); |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -862,7 +862,7 @@ static int rtl8366rb_reset_vlan(struct rtl8366_smi *smi) |
|
|
|
vlanmc.untag = 0; |
|
|
|
vlanmc.untag = 0; |
|
|
|
vlanmc.fid = 0; |
|
|
|
vlanmc.fid = 0; |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
for (i = 0; i < RTL8366RB_NUM_VLANS; i++) { |
|
|
|
err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc); |
|
|
|
err = smi->ops->set_vlan_mc(smi, i, &vlanmc); |
|
|
|
if (err) |
|
|
|
if (err) |
|
|
|
return err; |
|
|
|
return err; |
|
|
|
} |
|
|
|
} |
|
|
@ -1650,6 +1650,13 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { |
|
|
|
.detect = rtl8366rb_detect, |
|
|
|
.detect = rtl8366rb_detect, |
|
|
|
.mii_read = rtl8366rb_mii_read, |
|
|
|
.mii_read = rtl8366rb_mii_read, |
|
|
|
.mii_write = rtl8366rb_mii_write, |
|
|
|
.mii_write = rtl8366rb_mii_write, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.get_vlan_mc = rtl8366rb_get_vlan_mc, |
|
|
|
|
|
|
|
.set_vlan_mc = rtl8366rb_set_vlan_mc, |
|
|
|
|
|
|
|
.get_vlan_4k = rtl8366rb_get_vlan_4k, |
|
|
|
|
|
|
|
.set_vlan_4k = rtl8366rb_set_vlan_4k, |
|
|
|
|
|
|
|
.get_mc_index = rtl8366rb_get_mc_index, |
|
|
|
|
|
|
|
.set_mc_index = rtl8366rb_set_mc_index, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
static int __init rtl8366rb_probe(struct platform_device *pdev) |
|
|
|
static int __init rtl8366rb_probe(struct platform_device *pdev) |
|
|
|