[PATCH RESEND 1/3] staging: octeon: validate interface before calling INDEX

[Aaro Koskinen]

Some helper functions call INDEX before checking if the interface is
valid. Since pow0 is not a real interface, we get the following errors:

        cvmx_helper_get_interface_index_num: Illegal IPD port number

Fix by using INDEX only when needed with real interfaces.

Signed-off-by: Aaro Koskinen <aaro.koski...@nokia.com>
---
 drivers/staging/octeon/ethernet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/octeon/ethernet.c 
b/drivers/staging/octeon/ethernet.c
index e9cd5f2..190afde 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -237,7 +237,6 @@ static int cvm_oct_common_change_mtu(struct net_device 
*dev, int new_mtu)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
        int interface = INTERFACE(priv->port);
-       int index = INDEX(priv->port);
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
        int vlan_bytes = 4;
 #else
@@ -259,6 +258,7 @@ static int cvm_oct_common_change_mtu(struct net_device 
*dev, int new_mtu)
        if ((interface < 2) &&
            (cvmx_helper_interface_get_mode(interface) !=
                CVMX_HELPER_INTERFACE_MODE_SPI)) {
+               int index = INDEX(priv->port);
                /* Add ethernet header and FCS, and VLAN if configured. */
                int max_packet = new_mtu + 14 + 4 + vlan_bytes;
 
@@ -300,12 +300,12 @@ static void cvm_oct_common_set_multicast_list(struct 
net_device *dev)
        union cvmx_gmxx_prtx_cfg gmx_cfg;
        struct octeon_ethernet *priv = netdev_priv(dev);
        int interface = INTERFACE(priv->port);
-       int index = INDEX(priv->port);
 
        if ((interface < 2) &&
            (cvmx_helper_interface_get_mode(interface) !=
                CVMX_HELPER_INTERFACE_MODE_SPI)) {
                union cvmx_gmxx_rxx_adr_ctl control;
+               int index = INDEX(priv->port);
 
                control.u64 = 0;
                control.s.bcst = 1;     /* Allow broadcast MAC addresses */
@@ -352,7 +352,6 @@ static int cvm_oct_set_mac_filter(struct net_device *dev)
        struct octeon_ethernet *priv = netdev_priv(dev);
        union cvmx_gmxx_prtx_cfg gmx_cfg;
        int interface = INTERFACE(priv->port);
-       int index = INDEX(priv->port);
 
        if ((interface < 2) &&
            (cvmx_helper_interface_get_mode(interface) !=
@@ -360,6 +359,7 @@ static int cvm_oct_set_mac_filter(struct net_device *dev)
                int i;
                u8 *ptr = dev->dev_addr;
                u64 mac = 0;
+               int index = INDEX(priv->port);
 
                for (i = 0; i < 6; i++)
                        mac = (mac << 8) | (u64)ptr[i];
-- 
2.8.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel