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/dpaa: prefer defines for link speed values
[dpdk.git]
/
drivers
/
net
/
fm10k
/
base
/
fm10k_api.c
diff --git
a/drivers/net/fm10k/base/fm10k_api.c
b/drivers/net/fm10k/base/fm10k_api.c
index
0584413
..
c49d20d
100644
(file)
--- a/
drivers/net/fm10k/base/fm10k_api.c
+++ b/
drivers/net/fm10k/base/fm10k_api.c
@@
-55,6
+55,12
@@
s32 fm10k_set_mac_type(struct fm10k_hw *hw)
switch (hw->device_id) {
case FM10K_DEV_ID_PF:
switch (hw->device_id) {
case FM10K_DEV_ID_PF:
+#ifdef BOULDER_RAPIDS_HW
+ case FM10K_DEV_ID_SDI_FM10420_QDA2:
+#endif /* BOULDER_RAPIDS_HW */
+#ifdef ATWOOD_CHANNEL_HW
+ case FM10K_DEV_ID_SDI_FM10420_DA2:
+#endif /* ATWOOD_CHANNEL_HW */
hw->mac.type = fm10k_mac_pf;
break;
case FM10K_DEV_ID_VF:
hw->mac.type = fm10k_mac_pf;
break;
case FM10K_DEV_ID_VF:
@@
-175,6
+181,7
@@
s32 fm10k_get_bus_info(struct fm10k_hw *hw)
FM10K_NOT_IMPLEMENTED);
}
FM10K_NOT_IMPLEMENTED);
}
+#ifndef NO_IS_SLOT_APPROPRIATE_CHECK
/**
* fm10k_is_slot_appropriate - Indicate appropriate slot for this SKU
* @hw: pointer to hardware structure
/**
* fm10k_is_slot_appropriate - Indicate appropriate slot for this SKU
* @hw: pointer to hardware structure
@@
-189,6
+196,7
@@
bool fm10k_is_slot_appropriate(struct fm10k_hw *hw)
return true;
}
return true;
}
+#endif
/**
* fm10k_update_vlan - Clear VLAN ID to VLAN filter table
* @hw: pointer to hardware structure
/**
* fm10k_update_vlan - Clear VLAN ID to VLAN filter table
* @hw: pointer to hardware structure