Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
ibm
/
emac
/
core.h
diff --git
a/kernel/drivers/net/ethernet/ibm/emac/core.h
b/kernel/drivers/net/ethernet/ibm/emac/core.h
index
28df374
..
93ae114
100644
(file)
--- a/
kernel/drivers/net/ethernet/ibm/emac/core.h
+++ b/
kernel/drivers/net/ethernet/ibm/emac/core.h
@@
-181,7
+181,7
@@
struct emac_instance {
struct mal_commac commac;
/* PHY infos */
struct mal_commac commac;
/* PHY infos */
-
u32
phy_mode;
+
int
phy_mode;
u32 phy_map;
u32 phy_address;
u32 phy_feat_exc;
u32 phy_map;
u32 phy_address;
u32 phy_feat_exc;
@@
-460,8
+460,8
@@
struct emac_ethtool_regs_subhdr {
u32 index;
};
u32 index;
};
-#define EMAC_ETHTOOL_REGS_VER
0
-#define EMAC4_ETHTOOL_REGS_VER
1
-#define EMAC4SYNC_ETHTOOL_REGS_VER
2
+#define EMAC_ETHTOOL_REGS_VER
3
+#define EMAC4_ETHTOOL_REGS_VER
4
+#define EMAC4SYNC_ETHTOOL_REGS_VER
5
#endif /* __IBM_NEWEMAC_CORE_H */
#endif /* __IBM_NEWEMAC_CORE_H */