Merge tag 'net-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / include / uapi / linux / mii.h

diff --git a/include/uapi/linux/mii.h b/include/uapi/linux/mii.h
index 90f9b4e..39f7c44 100644 (file)
--- a/include/uapi/linux/mii.h
+++ b/include/uapi/linux/mii.h
@@ -151,11 +151,13 @@
 /* 1000BASE-T Control register */
 #define ADVERTISE_1000FULL     0x0200  /* Advertise 1000BASE-T full duplex */
 #define ADVERTISE_1000HALF     0x0100  /* Advertise 1000BASE-T half duplex */
+#define CTL1000_PREFER_MASTER  0x0400  /* prefer to operate as master */
 #define CTL1000_AS_MASTER      0x0800
 #define CTL1000_ENABLE_MASTER  0x1000
 
 /* 1000BASE-T Status register */
 #define LPA_1000MSFAIL         0x8000  /* Master/Slave resolution failure */
+#define LPA_1000MSRES          0x4000  /* Master/Slave resolution status */
 #define LPA_1000LOCALRXOK      0x2000  /* Link partner local receiver status */
 #define LPA_1000REMRXOK                0x1000  /* Link partner remote receiver status */
 #define LPA_1000FULL           0x0800  /* Link partner 1000BASE-T full duplex */