aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-07-15 13:05:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-07-15 13:05:43 +0000
commita59fa57985cf73c3c475bfbbb375dd9aac1815bd (patch)
tree7dd136b72920378cad1af8abd5cf8fcc72ecfb29
parentce7eca2dff722edfda9c91d50b51878de7c096c6 (diff)
downloadupstream-a59fa57985cf73c3c475bfbbb375dd9aac1815bd.tar.gz
upstream-a59fa57985cf73c3c475bfbbb375dd9aac1815bd.tar.bz2
upstream-a59fa57985cf73c3c475bfbbb375dd9aac1815bd.zip
generic: rtl8366: use smi->num_ports and smi->ops->get_vlan_4k
SVN-Revision: 22202
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366rb.c8
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366s.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 2efde1df3f..ae976f45b2 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -721,14 +721,14 @@ static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
memset(buf, '\0', sizeof(smi->buf));
- err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
if (err)
return err;
len += snprintf(buf + len, sizeof(smi->buf) - len,
"VLAN %d: Ports: '", vlan4k.vid);
- for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & (1 << i)))
continue;
@@ -811,11 +811,11 @@ static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
return -EINVAL;
- rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
port = &val->value.ports[0];
val->len = 0;
- for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & BIT(i)))
continue;
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index 4f4a5f3897..4ac675ea50 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -746,14 +746,14 @@ static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
memset(buf, '\0', sizeof(smi->buf));
- err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
if (err)
return err;
len += snprintf(buf + len, sizeof(smi->buf) - len,
"VLAN %d: Ports: '", vlan4k.vid);
- for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & (1 << i)))
continue;
@@ -838,11 +838,11 @@ static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
return -EINVAL;
- rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
port = &val->value.ports[0];
val->len = 0;
- for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & BIT(i)))
continue;
'>242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433