ixgbe: return error in set_rar when index out of range
Subsystems (3)
PATCH 1/1 ixgbe: return error in set_rar when index out of range
Return -1 when set_rar index is out of range
---
drivers/net/ixgbe/ixgbe_common.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
(quoted diff) +0 -0
b/drivers/net/ixgbe/ixgbe_common.c
index 1159d91..77b3cf4 100644
drivers/net/ixgbe/ixgbe_common.c +0 -0
@@ -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 -1;
}
return 0;
------------------------------------------------------------------------------
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
Quoted 8 lines · Shirley Ma
Return -1 when
set_rarindex is out of rangeSigned-off-by Shirley Ma <[email protected]>---
drivers/net/ixgbe/ixgbe_common.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
I think this should use IXGBE_ERR_<blah> instead and there is another spot where this could be used. Instead I propose this patch instead...
ixgbe: return IXGBE_ERR_RAR_INDEX when out of range
From: Jeff Kirsher <[email protected]>
Based on patch from Shirley Ma <[email protected]>
Return IXGBE_ERR_RAR_INDEX when RAR index is out of range, instead of returning IXGBE_SUCCESS.
---
drivers/net/ixgbe/ixgbe_common.c | 2 ++ drivers/net/ixgbe/ixgbe_type.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_common.c +0 -0
@@ -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
@@ -2600,6 +2600,7 @@ struct ixgbe_info {#define IXGBE_ERR_FDIR_REINIT_FAILED -23#define IXGBE_ERR_EEPROM_VERSION -24#define IXGBE_ERR_NO_SPACE -25 +#define IXGBE_ERR_RAR_INDEX -26#define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF#endif /* _IXGBE_TYPE_H_ */