EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

generic: rtl8366: prevent modifications of VLAN 0

Browse Source 
SVN-Revision: 21906
This commit is contained in:
Gabor Juhos 2010-06-26 19:15:38 +00:00
parent e827a12c48
commit 8742057763
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
View File

@ -1150,7 +1150,7 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
char *buf = rtl->buf;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
memset(buf, '\0', sizeof(rtl->buf));
@ -1288,7 +1288,7 @@ static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
struct switch_port *port;
int i;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
rtl8366rb_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
@ -1317,7 +1317,7 @@ static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
struct switch_port *port;
int i;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
rtl8366rb_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);

6
target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
View File

@ -1118,7 +1118,7 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
struct rtl8366s *rtl = sw_to_rtl8366s(dev);
char *buf = rtl->buf;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
memset(buf, '\0', sizeof(rtl->buf));
@ -1257,7 +1257,7 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
struct switch_port *port;
int i;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);
@ -1286,7 +1286,7 @@ static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
struct switch_port *port;
int i;
if (val->port_vlan >= RTL8366_NUM_VLANS)
if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
return -EINVAL;
rtl8366s_get_vlan_member_config(rtl, val->port_vlan, &vlanmc);