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
doc: fix typos in OcteonTx guides
[dpdk.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_pf.c
diff --git
a/drivers/net/ixgbe/ixgbe_pf.c
b/drivers/net/ixgbe/ixgbe_pf.c
index
44ab450
..
4e61310
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_pf.c
+++ b/
drivers/net/ixgbe/ixgbe_pf.c
@@
-15,7
+15,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.h>
+#include <rte_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>
@@
-244,7
+244,7
@@
int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
gpie &= ~IXGBE_GPIE_VTMODE_MASK;
gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
gpie &= ~IXGBE_GPIE_VTMODE_MASK;
- gpie |= IXGBE_GPIE_MSIX_MODE;
+ gpie |= IXGBE_GPIE_MSIX_MODE
| IXGBE_GPIE_PBA_SUPPORT
;
switch (RTE_ETH_DEV_SRIOV(eth_dev).active) {
case ETH_64_POOLS:
switch (RTE_ETH_DEV_SRIOV(eth_dev).active) {
case ETH_64_POOLS:
@@
-329,10
+329,7
@@
set_rx_mode(struct rte_eth_dev *dev)
IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
- if (dev->data->dev_conf.rxmode.hw_vlan_strip)
- ixgbe_vlan_hw_strip_enable_all(dev);
- else
- ixgbe_vlan_hw_strip_disable_all(dev);
+ ixgbe_vlan_hw_strip_config(dev);
}
static inline void
}
static inline void
@@
-739,7
+736,7
@@
ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
/* notify application about VF reset */
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
/* notify application about VF reset */
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
-
NULL,
&ret_param);
+ &ret_param);
return ret;
}
return ret;
}
@@
-751,7
+748,7
@@
ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
* if ret_param.retval > 1, do nothing and send NAK to VF
*/
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
* if ret_param.retval > 1, do nothing and send NAK to VF
*/
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
-
NULL,
&ret_param);
+ &ret_param);
retval = ret_param.retval;
retval = ret_param.retval;