aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
authorSreenivasa Honnur <Sreenivasa.Honnur@neterion.com>2008-04-23 13:31:33 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-25 02:07:11 -0400
commitc9fcbf4774d7a29b73078017af25d100f152a4af (patch)
tree3dad8c0860092e755ee69ab83fc09bf8082454ea /drivers/net/s2io.h
parent99993af6981aaf8d212a5efa888a19c9db152d58 (diff)
S2io: Removed rx_lock and put_lock
- Removed rx_lock and put_lock as the buffer replenishment and receive completion is handled serially. 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.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index e3136cfd6db2..ce53a02105f2 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -703,9 +703,6 @@ struct ring_info {
703 */ 703 */
704 struct rx_curr_get_info rx_curr_get_info; 704 struct rx_curr_get_info rx_curr_get_info;
705 705
706 /* Index to the absolute position of the put pointer of Rx ring */
707 int put_pos;
708
709 /* Buffer Address store. */ 706 /* Buffer Address store. */
710 struct buffAdd **ba; 707 struct buffAdd **ba;
711 struct s2io_nic *nic; 708 struct s2io_nic *nic;
@@ -877,8 +874,6 @@ struct s2io_nic {
877 874
878 atomic_t rx_bufs_left[MAX_RX_RINGS]; 875 atomic_t rx_bufs_left[MAX_RX_RINGS];
879 876
880 spinlock_t put_lock;
881
882#define PROMISC 1 877#define PROMISC 1
883#define ALL_MULTI 2 878#define ALL_MULTI 2
884 879
@@ -962,7 +957,6 @@ struct s2io_nic {
962 u8 lro; 957 u8 lro;
963 u16 lro_max_aggr_per_sess; 958 u16 lro_max_aggr_per_sess;
964 volatile unsigned long state; 959 volatile unsigned long state;
965 spinlock_t rx_lock;
966 u64 general_int_mask; 960 u64 general_int_mask;
967#define VPD_STRING_LEN 80 961#define VPD_STRING_LEN 80
968 u8 product_name[VPD_STRING_LEN]; 962 u8 product_name[VPD_STRING_LEN];