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
mlx4: avoid init errors when kernel modules are not loaded
[dpdk.git]
/
lib
/
librte_pmd_e1000
/
e1000
/
e1000_manage.c
diff --git
a/lib/librte_pmd_e1000/e1000/e1000_manage.c
b/lib/librte_pmd_e1000/e1000/e1000_manage.c
index
1879b85
..
30db892
100644
(file)
--- a/
lib/librte_pmd_e1000/e1000/e1000_manage.c
+++ b/
lib/librte_pmd_e1000/e1000/e1000_manage.c
@@
-1,6
+1,6
@@
/*******************************************************************************
/*******************************************************************************
-Copyright (c) 2001-201
2
, Intel Corporation
+Copyright (c) 2001-201
4
, Intel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-147,7
+147,7
@@
bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw)
/* If we can't read from the host interface for whatever
* reason, disable filtering.
*/
/* If we can't read from the host interface for whatever
* reason, disable filtering.
*/
- ret_val =
hw->mac.ops.mng_enable_host_if
(hw);
+ ret_val =
e1000_mng_enable_host_if_generic
(hw);
if (ret_val != E1000_SUCCESS) {
hw->mac.tx_pkt_filtering = false;
return hw->mac.tx_pkt_filtering;
if (ret_val != E1000_SUCCESS) {
hw->mac.tx_pkt_filtering = false;
return hw->mac.tx_pkt_filtering;
@@
-308,18
+308,18
@@
s32 e1000_mng_write_dhcp_info_generic(struct e1000_hw *hw, u8 *buffer,
hdr.checksum = 0;
/* Enable the host interface */
hdr.checksum = 0;
/* Enable the host interface */
- ret_val =
hw->mac.ops.mng_enable_host_if
(hw);
+ ret_val =
e1000_mng_enable_host_if_generic
(hw);
if (ret_val)
return ret_val;
/* Populate the host interface with the contents of "buffer". */
if (ret_val)
return ret_val;
/* Populate the host interface with the contents of "buffer". */
- ret_val =
hw->mac.ops.mng_host_if_write
(hw, buffer, length,
- sizeof(hdr), &(hdr.checksum));
+ ret_val =
e1000_mng_host_if_write_generic
(hw, buffer, length,
+
sizeof(hdr), &(hdr.checksum));
if (ret_val)
return ret_val;
/* Write the manageability command header */
if (ret_val)
return ret_val;
/* Write the manageability command header */
- ret_val =
hw->mac.ops.mng_write_cmd_header
(hw, &hdr);
+ ret_val =
e1000_mng_write_cmd_header_generic
(hw, &hdr);
if (ret_val)
return ret_val;
if (ret_val)
return ret_val;
@@
-373,7
+373,7
@@
bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
return true;
} else if ((manc & E1000_MANC_SMBUS_EN) &&
!(manc & E1000_MANC_ASF_EN)) {
return true;
} else if ((manc & E1000_MANC_SMBUS_EN) &&
!(manc & E1000_MANC_ASF_EN)) {
-
return true;
+ return true;
}
return false;
}
return false;