diff options
Diffstat (limited to 'drivers/net/ethernet/oki-semi')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c index 9cb5f912e489..29e23bec809c 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | |||
| @@ -321,10 +321,10 @@ static void pch_gbe_check_copper_options(struct pch_gbe_adapter *adapter) | |||
| 321 | pr_debug("AutoNeg specified along with Speed or Duplex, AutoNeg parameter ignored\n"); | 321 | pr_debug("AutoNeg specified along with Speed or Duplex, AutoNeg parameter ignored\n"); |
| 322 | hw->phy.autoneg_advertised = opt.def; | 322 | hw->phy.autoneg_advertised = opt.def; |
| 323 | } else { | 323 | } else { |
| 324 | hw->phy.autoneg_advertised = AutoNeg; | 324 | int tmp = AutoNeg; |
| 325 | pch_gbe_validate_option( | 325 | |
| 326 | (int *)(&hw->phy.autoneg_advertised), | 326 | pch_gbe_validate_option(&tmp, &opt, adapter); |
| 327 | &opt, adapter); | 327 | hw->phy.autoneg_advertised = tmp; |
| 328 | } | 328 | } |
| 329 | } | 329 | } |
| 330 | 330 | ||
| @@ -495,9 +495,10 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter) | |||
| 495 | .arg = { .l = { .nr = (int)ARRAY_SIZE(fc_list), | 495 | .arg = { .l = { .nr = (int)ARRAY_SIZE(fc_list), |
| 496 | .p = fc_list } } | 496 | .p = fc_list } } |
| 497 | }; | 497 | }; |
| 498 | hw->mac.fc = FlowControl; | 498 | int tmp = FlowControl; |
| 499 | pch_gbe_validate_option((int *)(&hw->mac.fc), | 499 | |
| 500 | &opt, adapter); | 500 | pch_gbe_validate_option(&tmp, &opt, adapter); |
| 501 | hw->mac.fc = tmp; | ||
| 501 | } | 502 | } |
| 502 | 503 | ||
| 503 | pch_gbe_check_copper_options(adapter); | 504 | pch_gbe_check_copper_options(adapter); |