diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /drivers/net/skge.h | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index e9354dfa7e9a..86467ae74d45 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h | |||
| @@ -2424,8 +2424,8 @@ struct skge_hw { | |||
| 2424 | u32 ram_size; | 2424 | u32 ram_size; |
| 2425 | u32 ram_offset; | 2425 | u32 ram_offset; |
| 2426 | u16 phy_addr; | 2426 | u16 phy_addr; |
| 2427 | struct work_struct phy_work; | 2427 | spinlock_t phy_lock; |
| 2428 | struct mutex phy_mutex; | 2428 | struct tasklet_struct phy_task; |
| 2429 | }; | 2429 | }; |
| 2430 | 2430 | ||
| 2431 | enum pause_control { | 2431 | enum pause_control { |
| @@ -2457,7 +2457,7 @@ struct skge_port { | |||
| 2457 | 2457 | ||
| 2458 | struct net_device_stats net_stats; | 2458 | struct net_device_stats net_stats; |
| 2459 | 2459 | ||
| 2460 | struct delayed_work link_thread; | 2460 | struct timer_list link_timer; |
| 2461 | enum pause_control flow_control; | 2461 | enum pause_control flow_control; |
| 2462 | enum pause_status flow_status; | 2462 | enum pause_status flow_status; |
| 2463 | u8 rx_csum; | 2463 | u8 rx_csum; |