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/ionic: split up queue-completion queue structure
[dpdk.git]
/
drivers
/
net
/
e1000
/
igb_pf.c
diff --git
a/drivers/net/e1000/igb_pf.c
b/drivers/net/e1000/igb_pf.c
index
ab48a26
..
2ce74dd
100644
(file)
--- a/
drivers/net/e1000/igb_pf.c
+++ b/
drivers/net/e1000/igb_pf.c
@@
-16,7
+16,7
@@
#include <rte_debug.h>
#include <rte_eal.h>
#include <rte_ether.h>
#include <rte_debug.h>
#include <rte_eal.h>
#include <rte_ether.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_memcpy.h>
#include <rte_malloc.h>
#include <rte_random.h>
#include <rte_memcpy.h>
#include <rte_malloc.h>
#include <rte_random.h>
@@
-37,7
+37,7
@@
dev_num_vf(struct rte_eth_dev *eth_dev)
static inline
int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
{
static inline
int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
{
- unsigned char vf_mac_addr[ETHER_ADDR_LEN];
+ unsigned char vf_mac_addr[
RTE_
ETHER_ADDR_LEN];
struct e1000_vf_info *vfinfo =
*E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
uint16_t vfn;
struct e1000_vf_info *vfinfo =
*E1000_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
uint16_t vfn;
@@
-46,7
+46,7
@@
int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
rte_eth_random_addr(vf_mac_addr);
/* keep the random address as default */
memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,
rte_eth_random_addr(vf_mac_addr);
/* keep the random address as default */
memcpy(vfinfo[vfn].vf_mac_addresses, vf_mac_addr,
- ETHER_ADDR_LEN);
+
RTE_
ETHER_ADDR_LEN);
}
return 0;
}
return 0;
@@
-290,7
+290,7
@@
igb_vf_reset(struct rte_eth_dev *dev, uint16_t vf, uint32_t *msgbuf)
/* reply to reset with ack and vf mac address */
msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK;
/* reply to reset with ack and vf mac address */
msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK;
- rte_memcpy(new_mac, vf_mac, ETHER_ADDR_LEN);
+ rte_memcpy(new_mac, vf_mac,
RTE_
ETHER_ADDR_LEN);
e1000_write_mbx(hw, msgbuf, 3, vf);
return 0;
e1000_write_mbx(hw, msgbuf, 3, vf);
return 0;
@@
-400,10
+400,11
@@
igb_vf_set_rlpml(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
{
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint16_t rlpml = msgbuf[1] & E1000_VMOLR_RLPML_MASK;
{
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint16_t rlpml = msgbuf[1] & E1000_VMOLR_RLPML_MASK;
- uint32_t max_frame = rlpml +
ETHER_HDR_LEN +
ETHER_CRC_LEN;
+ uint32_t max_frame = rlpml +
RTE_ETHER_HDR_LEN + RTE_
ETHER_CRC_LEN;
uint32_t vmolr;
uint32_t vmolr;
- if ((max_frame < ETHER_MIN_LEN) || (max_frame > ETHER_MAX_JUMBO_FRAME_LEN))
+ if (max_frame < RTE_ETHER_MIN_LEN ||
+ max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
return -1;
vmolr = E1000_READ_REG(hw, E1000_VMOLR(vf));
return -1;
vmolr = E1000_READ_REG(hw, E1000_VMOLR(vf));