bond: check null before use

Signed-off-by: Declan Doherty <declan.doherty@intel.com>
This commit is contained in:
Declan Doherty 2014-12-17 11:46:59 +00:00 committed by Thomas Monjalon
parent 86b426c82d
commit a0399ce10f

View File

@ -764,8 +764,6 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct ether_addr *dst_mac_addr)
{
struct ether_addr *mac_addr;
mac_addr = eth_dev->data->mac_addrs;
if (eth_dev == NULL) {
RTE_LOG(ERR, PMD, "%s: NULL pointer eth_dev specified\n", __func__);
return -1;
@ -776,6 +774,8 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct ether_addr *dst_mac_addr)
return -1;
}
mac_addr = eth_dev->data->mac_addrs;
ether_addr_copy(mac_addr, dst_mac_addr);
return 0;
}
@ -785,8 +785,6 @@ mac_address_set(struct rte_eth_dev *eth_dev, struct ether_addr *new_mac_addr)
{
struct ether_addr *mac_addr;
mac_addr = eth_dev->data->mac_addrs;
if (eth_dev == NULL) {
RTE_BOND_LOG(ERR, "NULL pointer eth_dev specified");
return -1;
@ -797,6 +795,8 @@ mac_address_set(struct rte_eth_dev *eth_dev, struct ether_addr *new_mac_addr)
return -1;
}
mac_addr = eth_dev->data->mac_addrs;
/* If new MAC is different to current MAC then update */
if (memcmp(mac_addr, new_mac_addr, sizeof(*mac_addr)) != 0)
memcpy(mac_addr, new_mac_addr, sizeof(*mac_addr));