diff options
| author |   Aaro Koskinen <aaro.koskinen@nokia.com> | 2016-06-29 15:20:45 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 18:02:32 +0200 |
| commit | 9eca4993dcfa17d21f28fae773c21b04d47b117d (patch) | |
| tree | 290888b851f2812958b25688a9ad6ad145867142 /drivers/staging/octeon | |
| parent | staging: octeon: validate interface before calling INDEX (diff) | |
| download | linux-dev-9eca4993dcfa17d21f28fae773c21b04d47b117d.tar.xz linux-dev-9eca4993dcfa17d21f28fae773c21b04d47b117d.zip | |
staging: octeon: check for pow0 before calling interface helper
Check for pow0 port first before calling the interface helper. This
avoids the following error log when setting up pow0 interface:
cvmx_helper_get_interface_num: Illegal IPD port number
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet-util.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h index 45f024bc5e33..617da8037a4d 100644 --- a/drivers/staging/octeon/ethernet-util.h +++ b/drivers/staging/octeon/ethernet-util.h @@ -32,12 +32,13 @@ static inline void *cvm_oct_get_buffer_ptr(union cvmx_buf_ptr packet_ptr) */ static inline int INTERFACE(int ipd_port) { - int interface = cvmx_helper_get_interface_num(ipd_port); + int interface; + if (ipd_port == CVMX_PIP_NUM_INPUT_PORTS) + return 10; + interface = cvmx_helper_get_interface_num(ipd_port); if (interface >= 0) return interface; - else if (ipd_port == CVMX_PIP_NUM_INPUT_PORTS) - return 10; panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port); } |