Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1868dc2 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller
Browse files

ixgbe: return IXGBE_ERR_RAR_INDEX when out of range 



Based on original patch from Shirley Ma <xma@us.ibm.com>
Return IXGBE_ERR_RAR_INDEX when RAR index is out of range, instead of
returning IXGBE_SUCCESS.

CC: Shirley Ma <xma@us.ibm.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db2c2417

drivers/net/ixgbe/ixgbe_common.c

+2 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq, 
		IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);

	} else {

		hw_dbg(hw, "RAR index %d is out of range.\n", index);

		return IXGBE_ERR_RAR_INDEX;

	}



	return 0;
@@ -1219,6 +1220,7 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index) 
		IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);

	} else {

		hw_dbg(hw, "RAR index %d is out of range.\n", index);

		return IXGBE_ERR_RAR_INDEX;

	}



	/* clear VMDq pool/queue selection for this RAR */

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -2609,6 +2609,7 @@ struct ixgbe_info { 
#define IXGBE_ERR_EEPROM_VERSION                -24

#define IXGBE_ERR_NO_SPACE                      -25

#define IXGBE_ERR_OVERTEMP                      -26

#define IXGBE_ERR_RAR_INDEX                     -27

#define IXGBE_NOT_IMPLEMENTED                   0x7FFFFFFF



#endif /* _IXGBE_TYPE_H_ */