diff options
author | Sreenivasa Honnur <Sreenivasa.Honnur@neterion.com> | 2008-04-23 13:29:42 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-25 02:07:10 -0400 |
commit | 99993af6981aaf8d212a5efa888a19c9db152d58 (patch) | |
tree | ba0121d049d58684cd96f08b797736671e9e20d0 /drivers/net/s2io.h | |
parent | 10371b5e6ba22173425877ea6a7040619b005fa1 (diff) |
S2io: Removed receive buffer replenishment tasklet
- Removed receive buffer replenishment tasklet s2io_tasklet and instead
allocating the receive buffers in either the interrupt handler (no napi)
or the napi handler (napi enabled).
Signed-off-by: Surjit Reang <surjit.reang@neterion.com>
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa@neterion.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/s2io.h')
-rw-r--r-- | drivers/net/s2io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index e68fdf7e4260..e3136cfd6db2 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
@@ -868,8 +868,6 @@ struct s2io_nic { | |||
868 | int device_enabled_once; | 868 | int device_enabled_once; |
869 | 869 | ||
870 | char name[60]; | 870 | char name[60]; |
871 | struct tasklet_struct task; | ||
872 | volatile unsigned long tasklet_status; | ||
873 | 871 | ||
874 | /* Timer that handles I/O errors/exceptions */ | 872 | /* Timer that handles I/O errors/exceptions */ |
875 | struct timer_list alarm_timer; | 873 | struct timer_list alarm_timer; |
@@ -1094,7 +1092,6 @@ static void s2io_handle_errors(void * dev_id); | |||
1094 | static int s2io_starter(void); | 1092 | static int s2io_starter(void); |
1095 | static void s2io_closer(void); | 1093 | static void s2io_closer(void); |
1096 | static void s2io_tx_watchdog(struct net_device *dev); | 1094 | static void s2io_tx_watchdog(struct net_device *dev); |
1097 | static void s2io_tasklet(unsigned long dev_addr); | ||
1098 | static void s2io_set_multicast(struct net_device *dev); | 1095 | static void s2io_set_multicast(struct net_device *dev); |
1099 | static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp); | 1096 | static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp); |
1100 | static void s2io_link(struct s2io_nic * sp, int link); | 1097 | static void s2io_link(struct s2io_nic * sp, int link); |