git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnx2x: fix invalid free on unplug
[dpdk.git]
/
drivers
/
net
/
dpaa
/
dpaa_ethdev.c
diff --git
a/drivers/net/dpaa/dpaa_ethdev.c
b/drivers/net/dpaa/dpaa_ethdev.c
index
2e043fe
..
4b00279
100644
(file)
--- a/
drivers/net/dpaa/dpaa_ethdev.c
+++ b/
drivers/net/dpaa/dpaa_ethdev.c
@@
-146,13
+146,13
@@
static int
dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
- uint32_t frame_size = mtu +
ETHER_HDR_LEN +
ETHER_CRC_LEN
+ uint32_t frame_size = mtu +
RTE_ETHER_HDR_LEN + RTE_
ETHER_CRC_LEN
+ VLAN_TAG_SIZE;
uint32_t buffsz = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
PMD_INIT_FUNC_TRACE();
+ VLAN_TAG_SIZE;
uint32_t buffsz = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
PMD_INIT_FUNC_TRACE();
- if (mtu < ETHER_MIN_MTU || frame_size > DPAA_MAX_RX_PKT_LEN)
+ if (mtu <
RTE_
ETHER_MIN_MTU || frame_size > DPAA_MAX_RX_PKT_LEN)
return -EINVAL;
/*
* Refuse mtu that requires the support of scattered packets
return -EINVAL;
/*
* Refuse mtu that requires the support of scattered packets
@@
-172,7
+172,7
@@
dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
return -EINVAL;
}
return -EINVAL;
}
- if (frame_size > ETHER_MAX_LEN)
+ if (frame_size >
RTE_
ETHER_MAX_LEN)
dev->data->dev_conf.rxmode.offloads &=
DEV_RX_OFFLOAD_JUMBO_FRAME;
else
dev->data->dev_conf.rxmode.offloads &=
DEV_RX_OFFLOAD_JUMBO_FRAME;
else
@@
-230,7
+230,7
@@
dpaa_eth_dev_configure(struct rte_eth_dev *dev)
fman_if_set_maxfrm(dpaa_intf->fif, max_len);
dev->data->mtu = max_len
fman_if_set_maxfrm(dpaa_intf->fif, max_len);
dev->data->mtu = max_len
-
- ETHER_HDR_LEN -
ETHER_CRC_LEN - VLAN_TAG_SIZE;
+
- RTE_ETHER_HDR_LEN - RTE_
ETHER_CRC_LEN - VLAN_TAG_SIZE;
}
if (rx_offloads & DEV_RX_OFFLOAD_SCATTER) {
}
if (rx_offloads & DEV_RX_OFFLOAD_SCATTER) {
@@
-934,7
+934,7
@@
dpaa_flow_ctrl_get(struct rte_eth_dev *dev,
static int
dpaa_dev_add_mac_addr(struct rte_eth_dev *dev,
static int
dpaa_dev_add_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *addr,
+ struct
rte_
ether_addr *addr,
uint32_t index,
__rte_unused uint32_t pool)
{
uint32_t index,
__rte_unused uint32_t pool)
{
@@
-964,7
+964,7
@@
dpaa_dev_remove_mac_addr(struct rte_eth_dev *dev,
static int
dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
static int
dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
- struct ether_addr *addr)
+ struct
rte_
ether_addr *addr)
{
int ret;
struct dpaa_if *dpaa_intf = dev->data->dev_private;
{
int ret;
struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@
-1364,17
+1364,17
@@
dpaa_dev_init(struct rte_eth_dev *eth_dev)
/* Allocate memory for storing MAC addresses */
eth_dev->data->mac_addrs = rte_zmalloc("mac_addr",
/* Allocate memory for storing MAC addresses */
eth_dev->data->mac_addrs = rte_zmalloc("mac_addr",
- ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER, 0);
+
RTE_
ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER, 0);
if (eth_dev->data->mac_addrs == NULL) {
DPAA_PMD_ERR("Failed to allocate %d bytes needed to "
"store MAC addresses",
if (eth_dev->data->mac_addrs == NULL) {
DPAA_PMD_ERR("Failed to allocate %d bytes needed to "
"store MAC addresses",
- ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER);
+
RTE_
ETHER_ADDR_LEN * DPAA_MAX_MAC_FILTER);
ret = -ENOMEM;
goto free_tx;
}
/* copy the primary mac address */
ret = -ENOMEM;
goto free_tx;
}
/* copy the primary mac address */
- ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]);
+
rte_
ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]);
RTE_LOG(INFO, PMD, "net: dpaa: %s: %02x:%02x:%02x:%02x:%02x:%02x\n",
dpaa_device->name,
RTE_LOG(INFO, PMD, "net: dpaa: %s: %02x:%02x:%02x:%02x:%02x:%02x\n",
dpaa_device->name,
@@
-1396,7
+1396,7
@@
dpaa_dev_init(struct rte_eth_dev *eth_dev)
fman_if_stats_reset(fman_intf);
/* Disable SG by default */
fman_if_set_sg(fman_intf, 0);
fman_if_stats_reset(fman_intf);
/* Disable SG by default */
fman_if_set_sg(fman_intf, 0);
- fman_if_set_maxfrm(fman_intf, ETHER_MAX_LEN + VLAN_TAG_SIZE);
+ fman_if_set_maxfrm(fman_intf,
RTE_
ETHER_MAX_LEN + VLAN_TAG_SIZE);
return 0;
return 0;