Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / octeon / ethernet-util.h

diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h
index 45f024bc5e33f777d2a320633dff9eb55dfac64d..617da8037a4dd28d791a2c775e48da4a9be30234 100644 (file)
--- 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);
 }