openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Aaro Koskinen 2016-06-29 15:20:45 +03:00 committed by Greg Kroah-Hartman
parent 0ad1ed99d6
commit 9eca4993dc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/octeon/ethernet-util.h
View File

@ -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) 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) if (interface >= 0)
return interface; return interface;
else if (ipd_port == CVMX_PIP_NUM_INPUT_PORTS)
return 10;
panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port); panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port);
} }