projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
intel
/
ixgbe
/
ixgbe_x540.c
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 66c5e946284e0b68489ccd924e9ec21727023079..389324f5929a5ef9fd16bac01b9a6d799943747a 100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@
-854,6
+854,7
@@
static struct ixgbe_mac_operations mac_ops_X540 = {
.enable_rx_buff = &ixgbe_enable_rx_buff_generic,
.get_thermal_sensor_data = NULL,
.init_thermal_sensor_thresh = NULL,
+ .mng_fw_enabled = NULL,
};
static struct ixgbe_eeprom_operations eeprom_ops_X540 = {