git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: tsc prevent time going backwards
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
macb.h
diff --git
a/drivers/net/macb.h
b/drivers/net/macb.h
index 27bf0ae0f0bb8310136e749fa94d8d495d92d09d..57b85acf0d1685d6a239e8ff9c9a3f0862c9dbf5 100644
(file)
--- a/
drivers/net/macb.h
+++ b/
drivers/net/macb.h
@@
-200,7
+200,7
@@
#define MACB_SOF_OFFSET 30
#define MACB_SOF_SIZE 2
#define MACB_SOF_OFFSET 30
#define MACB_SOF_SIZE 2
-/* Bitfields in USRIO */
+/* Bitfields in USRIO
(AVR32)
*/
#define MACB_MII_OFFSET 0
#define MACB_MII_SIZE 1
#define MACB_EAM_OFFSET 1
#define MACB_MII_OFFSET 0
#define MACB_MII_SIZE 1
#define MACB_EAM_OFFSET 1
@@
-210,6
+210,12
@@
#define MACB_TX_PAUSE_ZERO_OFFSET 3
#define MACB_TX_PAUSE_ZERO_SIZE 1
#define MACB_TX_PAUSE_ZERO_OFFSET 3
#define MACB_TX_PAUSE_ZERO_SIZE 1
+/* Bitfields in USRIO (AT91) */
+#define MACB_RMII_OFFSET 0
+#define MACB_RMII_SIZE 1
+#define MACB_CLKEN_OFFSET 1
+#define MACB_CLKEN_SIZE 1
+
/* Bitfields in WOL */
#define MACB_IP_OFFSET 0
#define MACB_IP_SIZE 16
/* Bitfields in WOL */
#define MACB_IP_OFFSET 0
#define MACB_IP_SIZE 16
@@
-368,6
+374,7
@@
struct macb {
struct clk *pclk;
struct clk *hclk;
struct net_device *dev;
struct clk *pclk;
struct clk *hclk;
struct net_device *dev;
+ struct napi_struct napi;
struct net_device_stats stats;
struct macb_stats hw_stats;
struct net_device_stats stats;
struct macb_stats hw_stats;
@@
-377,11
+384,11
@@
struct macb {
unsigned int rx_pending, tx_pending;
unsigned int rx_pending, tx_pending;
- struct
delayed_work periodic_task
;
-
-
struct mutex mdio_mutex
;
-
struct completion mdio_complete
;
-
struct mii_if_info mii
;
+ struct
mii_bus mii_bus
;
+ struct phy_device *phy_dev;
+
unsigned int link
;
+
unsigned int speed
;
+
unsigned int duplex
;
};
#endif /* _MACB_H */
};
#endif /* _MACB_H */