projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 2.6.21-rc5
[powerpc.git]
/
drivers
/
net
/
skge.h
diff --git
a/drivers/net/skge.h
b/drivers/net/skge.h
index
e9354df
..
86467ae
100644
(file)
--- a/
drivers/net/skge.h
+++ b/
drivers/net/skge.h
@@
-2424,8
+2424,8
@@
struct skge_hw {
u32 ram_size;
u32 ram_offset;
u16 phy_addr;
u32 ram_size;
u32 ram_offset;
u16 phy_addr;
- s
truct work_struct phy_wor
k;
- struct
mutex phy_mutex
;
+ s
pinlock_t phy_loc
k;
+ struct
tasklet_struct phy_task
;
};
enum pause_control {
};
enum pause_control {
@@
-2457,7
+2457,7
@@
struct skge_port {
struct net_device_stats net_stats;
struct net_device_stats net_stats;
- struct
delayed_work link_thread
;
+ struct
timer_list link_timer
;
enum pause_control flow_control;
enum pause_status flow_status;
u8 rx_csum;
enum pause_control flow_control;
enum pause_status flow_status;
u8 rx_csum;