staging: slicoss: Fix space-related checkpatch.pl warnings

This fixes all instances of "Please, no spaces at start of a new line" "Please, no spaces before tabs" Please note that I probably got the warning names wrong, but they should be close enough for usage here :) Additional post-commit note: There is one comment on line 230ish in slic.h that appears to have lost it's formatting. It was fine when I was working in Geany, but it caught my eye in the below diff. Sorry if it actually happened! Signed-off-by: Cruz Julian Bishop <cruzjbishop@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging: slicoss: Fix space-related checkpatch.pl warnings
This fixes all instances of "Please, no spaces at start of a new line" "Please, no spaces before tabs" Please note that I probably got the warning names wrong, but they should be close enough for usage here :) Additional post-commit note: There is one comment on line 230ish in slic.h that appears to have lost it's formatting. It was fine when I was working in Geany, but it caught my eye in the below diff. Sorry if it actually happened! Signed-off-by: Cruz Julian Bishop <cruzjbishop@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cruz Julian Bishop · Greg Kroah-Hartman
1 parent 83682cd2fe
Showing 3 changed files with 266 additions and 266 deletions Side-by-side Diff
drivers/staging/slicoss/slic.h
drivers/staging/slicoss/slichw.h
drivers/staging/slicoss/slicoss.c
@@ -43,15 +43,15 @@
  
 /* firmware stuff */
 #define OASIS_UCODE_VERS_STRING	"1.2"
-#define OASIS_UCODE_VERS_DATE  	"2006/03/27 15:10:37"
-#define OASIS_UCODE_HOSTIF_ID  	3
+#define OASIS_UCODE_VERS_DATE	"2006/03/27 15:10:37"
+#define OASIS_UCODE_HOSTIF_ID	3
  
 #define MOJAVE_UCODE_VERS_STRING	"1.2"
-#define MOJAVE_UCODE_VERS_DATE  	"2006/03/27 15:12:22"
-#define MOJAVE_UCODE_HOSTIF_ID  	3
+#define MOJAVE_UCODE_VERS_DATE		"2006/03/27 15:12:22"
+#define MOJAVE_UCODE_HOSTIF_ID		3
  
 #define GB_RCVUCODE_VERS_STRING	"1.2"
-#define GB_RCVUCODE_VERS_DATE  	"2006/03/27 15:12:15"
+#define GB_RCVUCODE_VERS_DATE	"2006/03/27 15:12:15"
 static u32 OasisRcvUCodeLen = 512;
 static u32 GBRcvUCodeLen = 512;
 #define SECTION_SIZE 65536
@@ -65,12 +65,12 @@
 #define SLIC_RSPQ_BUFSINPAGE      (PAGE_SIZE / SLIC_RSPBUF_SIZE)
  
 struct slic_rspqueue {
-    u32             offset;
-    u32             pageindex;
-    u32             num_pages;
-    struct slic_rspbuf *rspbuf;
-    u32 *vaddr[SLIC_RSPQ_PAGES_GB];
-    dma_addr_t          paddr[SLIC_RSPQ_PAGES_GB];
+	u32             offset;
+	u32             pageindex;
+	u32             num_pages;
+	struct slic_rspbuf *rspbuf;
+	u32 *vaddr[SLIC_RSPQ_PAGES_GB];
+	dma_addr_t          paddr[SLIC_RSPQ_PAGES_GB];
 };
  
 #define SLIC_RCVQ_EXPANSION         1
  
@@ -82,20 +82,20 @@
 #define SLIC_RCVQ_FILLTHRESH        (SLIC_RCVQ_ENTRIES - SLIC_RCVQ_FILLENTRIES)
  
 struct slic_rcvqueue {
-    struct sk_buff    *head;
-    struct sk_buff    *tail;
-    u32            count;
-    u32            size;
-    u32            errors;
+	struct sk_buff    *head;
+	struct sk_buff    *tail;
+	u32            count;
+	u32            size;
+	u32            errors;
 };
  
 struct slic_rcvbuf_info {
-    u32     id;
-    u32     starttime;
-    u32     stoptime;
-    u32     slicworld;
-    u32     lasttime;
-    u32     lastid;
+	u32     id;
+	u32     starttime;
+	u32     stoptime;
+	u32     slicworld;
+	u32     lasttime;
+	u32     lastid;
 };
 /*
  SLIC Handle structure.  Used to restrict handle values to
@@ -113,12 +113,12 @@
 };
  
 struct slic_handle {
-    struct slic_handle_word  token;  /* token passed between host and card*/
-    ushort                      type;
-    void *address;    /* actual address of the object*/
-    ushort                      offset;
-    struct slic_handle       *other_handle;
-    struct slic_handle       *next;
+	struct slic_handle_word  token;  /* token passed between host and card*/
+	ushort                      type;
+	void *address;    /* actual address of the object*/
+	ushort                      offset;
+	struct slic_handle       *other_handle;
+	struct slic_handle       *next;
 };
  
 #define SLIC_HANDLE_FREE        0x0000
@@ -134,17 +134,17 @@
 #define SLIC_HOSTCMD_SIZE    512
  
 struct slic_hostcmd {
-    struct slic_host64_cmd  cmd64;
-    u32                    type;
-    struct sk_buff            *skb;
-    u32                    paddrl;
-    u32                    paddrh;
-    u32                    busy;
-    u32                    cmdsize;
-    ushort                     numbufs;
-    struct slic_handle    *pslic_handle;/* handle associated with command */
-    struct slic_hostcmd    *next;
-    struct slic_hostcmd    *next_all;
+	struct slic_host64_cmd  cmd64;
+	u32                    type;
+	struct sk_buff            *skb;
+	u32                    paddrl;
+	u32                    paddrh;
+	u32                    busy;
+	u32                    cmdsize;
+	ushort                     numbufs;
+	struct slic_handle    *pslic_handle;/* handle associated with command */
+	struct slic_hostcmd    *next;
+	struct slic_hostcmd    *next_all;
 };
  
 #define SLIC_CMDQ_CMDSINPAGE    (PAGE_SIZE / SLIC_HOSTCMD_SIZE)
  
  
@@ -228,35 +228,35 @@
 #define SLIC_CARD_STATE(x)    ((x == CARD_UP) ? "UP" : "Down")
  
 struct slic_iface_stats {
-    /*
-     * Stats
-     */
-    u64        xmt_bytes;
-    u64        xmt_ucast;
-    u64        xmt_mcast;
-    u64        xmt_bcast;
-    u64        xmt_errors;
-    u64        xmt_discards;
-    u64        xmit_collisions;
-    u64        xmit_excess_xmit_collisions;
-    u64        rcv_bytes;
-    u64        rcv_ucast;
-    u64        rcv_mcast;
-    u64        rcv_bcast;
-    u64        rcv_errors;
-    u64        rcv_discards;
+	/*
+	* Stats
+	*/
+	u64        xmt_bytes;
+	u64        xmt_ucast;
+	u64        xmt_mcast;
+	u64        xmt_bcast;
+	u64        xmt_errors;
+	u64        xmt_discards;
+	u64        xmit_collisions;
+	u64        xmit_excess_xmit_collisions;
+	u64        rcv_bytes;
+	u64        rcv_ucast;
+	u64        rcv_mcast;
+	u64        rcv_bcast;
+	u64        rcv_errors;
+	u64        rcv_discards;
 };
  
 struct sliccp_stats {
-    u64        xmit_tcp_segs;
-    u64        xmit_tcp_bytes;
-    u64        rcv_tcp_segs;
-    u64        rcv_tcp_bytes;
+	u64        xmit_tcp_segs;
+	u64        xmit_tcp_bytes;
+	u64        rcv_tcp_segs;
+	u64        rcv_tcp_bytes;
 };
  
 struct slicnet_stats {
-    struct sliccp_stats        tcp;
-    struct slic_iface_stats      iface;
+	struct sliccp_stats        tcp;
+	struct slic_iface_stats      iface;
 };
  
 #define SLIC_LOADTIMER_PERIOD     1
  
@@ -285,51 +285,51 @@
 #define SLIC_INTAGG_5GB           100
  
 struct ether_header {
-    unsigned char    ether_dhost[6];
-    unsigned char    ether_shost[6];
-    ushort   ether_type;
+	unsigned char    ether_dhost[6];
+	unsigned char    ether_shost[6];
+	ushort   ether_type;
 };
  
 struct sliccard {
-    uint              busnumber;
-    uint              slotnumber;
-    uint              state;
-    uint              cardnum;
-    uint              card_size;
-    uint              adapters_activated;
-    uint              adapters_allocated;
-    uint              adapters_sleeping;
-    uint              gennumber;
-    u32           events;
-    u32           loadlevel_current;
-    u32           load;
-    uint              reset_in_progress;
-    u32           pingstatus;
-    u32           bad_pingstatus;
-    struct timer_list loadtimer;
-    u32           loadtimerset;
-    uint              config_set;
-    struct slic_config  config;
-    struct dentry      *debugfs_dir;
-    struct dentry      *debugfs_cardinfo;
-    struct adapter  *master;
-    struct adapter  *adapter[SLIC_MAX_PORTS];
-    struct sliccard *next;
-    u32             error_interrupts;
-    u32             error_rmiss_interrupts;
-    u32             rcv_interrupts;
-    u32             xmit_interrupts;
-    u32             num_isrs;
-    u32             false_interrupts;
-    u32             max_isr_rcvs;
-    u32             max_isr_xmits;
-    u32             rcv_interrupt_yields;
-    u32             tx_packets;
-    u32             debug_ix;
-    ushort              reg_type[32];
-    ushort              reg_offset[32];
-    u32             reg_value[32];
-    u32             reg_valueh[32];
+	uint              busnumber;
+	uint              slotnumber;
+	uint              state;
+	uint              cardnum;
+	uint              card_size;
+	uint              adapters_activated;
+	uint              adapters_allocated;
+	uint              adapters_sleeping;
+	uint              gennumber;
+	u32           events;
+	u32           loadlevel_current;
+	u32           load;
+	uint              reset_in_progress;
+	u32           pingstatus;
+	u32           bad_pingstatus;
+	struct timer_list loadtimer;
+	u32           loadtimerset;
+	uint              config_set;
+	struct slic_config  config;
+	struct dentry      *debugfs_dir;
+	struct dentry      *debugfs_cardinfo;
+	struct adapter  *master;
+	struct adapter  *adapter[SLIC_MAX_PORTS];
+	struct sliccard *next;
+	u32             error_interrupts;
+	u32             error_rmiss_interrupts;
+	u32             rcv_interrupts;
+	u32             xmit_interrupts;
+	u32             num_isrs;
+	u32             false_interrupts;
+	u32             max_isr_rcvs;
+	u32             max_isr_xmits;
+	u32             rcv_interrupt_yields;
+	u32             tx_packets;
+	u32             debug_ix;
+	ushort              reg_type[32];
+	ushort              reg_offset[32];
+	u32             reg_value[32];
+	u32             reg_valueh[32];
 };
  
 #define NUM_CFG_SPACES      2
  
  
  
  
  
  
  
  
  
  
@@ -337,182 +337,182 @@
 #define NUM_CFG_REG_ULONGS  (NUM_CFG_REGS / sizeof(u32))
  
 struct physcard {
-    struct adapter  *adapter[SLIC_MAX_PORTS];
-    struct physcard *next;
-    uint                adapters_allocd;
+	struct adapter  *adapter[SLIC_MAX_PORTS];
+	struct physcard *next;
+	uint                adapters_allocd;
  
- /*  the following is not currently needed
-    u32               bridge_busnum;
-    u32               bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];
- */
+/*  the following is not currently needed
+	u32              bridge_busnum;
+	u32              bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];
+*/
 };
  
 struct base_driver {
-    struct slic_spinlock driver_lock;
-    u32              num_slic_cards;
-    u32              num_slic_ports;
-    u32              num_slic_ports_active;
-    u32              dynamic_intagg;
-    struct sliccard  *slic_card;
-    struct physcard  *phys_card;
-    uint                 cardnuminuse[SLIC_MAX_CARDS];
+	struct slic_spinlock driver_lock;
+	u32              num_slic_cards;
+	u32              num_slic_ports;
+	u32              num_slic_ports_active;
+	u32              dynamic_intagg;
+	struct sliccard  *slic_card;
+	struct physcard  *phys_card;
+	uint                 cardnuminuse[SLIC_MAX_CARDS];
 };
  
 struct slic_shmem {
-    volatile u32          isr;
-    volatile u32          linkstatus;
-    volatile struct slic_stats     inicstats;
+	volatile u32          isr;
+	volatile u32          linkstatus;
+	volatile struct slic_stats     inicstats;
 };
  
 struct slic_reg_params {
-    u32       linkspeed;
-    u32       linkduplex;
-    u32       fail_on_bad_eeprom;
+	u32       linkspeed;
+	u32       linkduplex;
+	u32       fail_on_bad_eeprom;
 };
  
 struct slic_upr {
-    uint               adapter;
-    u32            upr_request;
-    u32            upr_data;
-    u32            upr_data_h;
-    u32            upr_buffer;
-    u32            upr_buffer_h;
-    struct slic_upr *next;
+	uint               adapter;
+	u32            upr_request;
+	u32            upr_data;
+	u32            upr_data_h;
+	u32            upr_buffer;
+	u32            upr_buffer_h;
+	struct slic_upr *next;
 };
  
 struct slic_ifevents {
-    uint        oflow802;
-    uint        uflow802;
-    uint        Tprtoflow;
-    uint        rcvearly;
-    uint        Bufov;
-    uint        Carre;
-    uint        Longe;
-    uint        Invp;
-    uint        Crc;
-    uint        Drbl;
-    uint        Code;
-    uint        IpHlen;
-    uint        IpLen;
-    uint        IpCsum;
-    uint        TpCsum;
-    uint        TpHlen;
+	uint        oflow802;
+	uint        uflow802;
+	uint        Tprtoflow;
+	uint        rcvearly;
+	uint        Bufov;
+	uint        Carre;
+	uint        Longe;
+	uint        Invp;
+	uint        Crc;
+	uint        Drbl;
+	uint        Code;
+	uint        IpHlen;
+	uint        IpLen;
+	uint        IpCsum;
+	uint        TpCsum;
+	uint        TpHlen;
 };
  
 struct adapter {
-    void *ifp;
-    struct sliccard *card;
-    uint                port;
-    struct physcard *physcard;
-    uint                physport;
-    uint                cardindex;
-    uint                card_size;
-    uint                chipid;
-    struct net_device  *netdev;
-    struct net_device  *next_netdevice;
-    struct slic_spinlock     adapter_lock;
-    struct slic_spinlock     reset_lock;
-    struct pci_dev     *pcidev;
-    uint                busnumber;
-    uint                slotnumber;
-    uint                functionnumber;
-    ushort              vendid;
-    ushort              devid;
-    ushort              subsysid;
-    u32             irq;
-    void __iomem *memorybase;
-    u32             memorylength;
-    u32             drambase;
-    u32             dramlength;
-    uint                queues_initialized;
-    uint                allocated;
-    uint                activated;
-    u32             intrregistered;
-    uint                isp_initialized;
-    uint                gennumber;
-    u32             curaddrupper;
-    struct slic_shmem      *pshmem;
-    dma_addr_t          phys_shmem;
-    u32             isrcopy;
-    __iomem struct slic_regs       *slic_regs;
-    unsigned char               state;
-    unsigned char               linkstate;
-    unsigned char               linkspeed;
-    unsigned char               linkduplex;
-    uint                flags;
-    unsigned char               macaddr[6];
-    unsigned char               currmacaddr[6];
-    u32             macopts;
-    ushort              devflags_prev;
-    u64             mcastmask;
-    struct mcast_address   *mcastaddrs;
-    struct slic_upr   *upr_list;
-    uint                upr_busy;
-    struct timer_list   pingtimer;
-    u32             pingtimerset;
-    struct timer_list   loadtimer;
-    u32             loadtimerset;
-    struct dentry      *debugfs_entry;
-    struct slic_spinlock     upr_lock;
-    struct slic_spinlock     bit64reglock;
-    struct slic_rspqueue     rspqueue;
-    struct slic_rcvqueue     rcvqueue;
-    struct slic_cmdqueue     cmdq_free;
-    struct slic_cmdqueue     cmdq_done;
-    struct slic_cmdqueue     cmdq_all;
-    struct slic_cmdqmem      cmdqmem;
-    /*
-     *  SLIC Handles
-    */
-    struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS+1]; /* Object handles*/
-    struct slic_handle *pfree_slic_handles;          /* Free object handles*/
-    struct slic_spinlock     handle_lock;           /* Object handle list lock*/
-    ushort              slic_handle_ix;
+	void *ifp;
+	struct sliccard *card;
+	uint                port;
+	struct physcard *physcard;
+	uint                physport;
+	uint                cardindex;
+	uint                card_size;
+	uint                chipid;
+	struct net_device  *netdev;
+	struct net_device  *next_netdevice;
+	struct slic_spinlock     adapter_lock;
+	struct slic_spinlock     reset_lock;
+	struct pci_dev     *pcidev;
+	uint                busnumber;
+	uint                slotnumber;
+	uint                functionnumber;
+	ushort              vendid;
+	ushort              devid;
+	ushort              subsysid;
+	u32             irq;
+	void __iomem *memorybase;
+	u32             memorylength;
+	u32             drambase;
+	u32             dramlength;
+	uint                queues_initialized;
+	uint                allocated;
+	uint                activated;
+	u32             intrregistered;
+	uint                isp_initialized;
+	uint                gennumber;
+	u32             curaddrupper;
+	struct slic_shmem      *pshmem;
+	dma_addr_t          phys_shmem;
+	u32             isrcopy;
+	__iomem struct slic_regs       *slic_regs;
+	unsigned char               state;
+	unsigned char               linkstate;
+	unsigned char               linkspeed;
+	unsigned char               linkduplex;
+	uint                flags;
+	unsigned char               macaddr[6];
+	unsigned char               currmacaddr[6];
+	u32             macopts;
+	ushort              devflags_prev;
+	u64             mcastmask;
+	struct mcast_address   *mcastaddrs;
+	struct slic_upr   *upr_list;
+	uint                upr_busy;
+	struct timer_list   pingtimer;
+	u32             pingtimerset;
+	struct timer_list   loadtimer;
+	u32             loadtimerset;
+	struct dentry      *debugfs_entry;
+	struct slic_spinlock     upr_lock;
+	struct slic_spinlock     bit64reglock;
+	struct slic_rspqueue     rspqueue;
+	struct slic_rcvqueue     rcvqueue;
+	struct slic_cmdqueue     cmdq_free;
+	struct slic_cmdqueue     cmdq_done;
+	struct slic_cmdqueue     cmdq_all;
+	struct slic_cmdqmem      cmdqmem;
+	/*
+	*  SLIC Handles
+	*/
+	struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS+1]; /* Object handles*/
+	struct slic_handle *pfree_slic_handles;          /* Free object handles*/
+	struct slic_spinlock     handle_lock;           /* Object handle list lock*/
+	ushort              slic_handle_ix;
  
-    u32             xmitq_full;
-    u32             all_reg_writes;
-    u32             icr_reg_writes;
-    u32             isr_reg_writes;
-    u32             error_interrupts;
-    u32             error_rmiss_interrupts;
-    u32             rx_errors;
-    u32             rcv_drops;
-    u32             rcv_interrupts;
-    u32             xmit_interrupts;
-    u32             linkevent_interrupts;
-    u32             upr_interrupts;
-    u32             num_isrs;
-    u32             false_interrupts;
-    u32             tx_packets;
-    u32             xmit_completes;
-    u32             tx_drops;
-    u32             rcv_broadcasts;
-    u32             rcv_multicasts;
-    u32             rcv_unicasts;
-    u32             max_isr_rcvs;
-    u32             max_isr_xmits;
-    u32             rcv_interrupt_yields;
-    u32             intagg_period;
-    struct inicpm_state    *inicpm_info;
-    void *pinicpm_info;
-    struct slic_reg_params   reg_params;
-    struct slic_ifevents  if_events;
-    struct slic_stats        inicstats_prev;
-    struct slicnet_stats     slic_stats;
+	u32             xmitq_full;
+	u32             all_reg_writes;
+	u32             icr_reg_writes;
+	u32             isr_reg_writes;
+	u32             error_interrupts;
+	u32             error_rmiss_interrupts;
+	u32             rx_errors;
+	u32             rcv_drops;
+	u32             rcv_interrupts;
+	u32             xmit_interrupts;
+	u32             linkevent_interrupts;
+	u32             upr_interrupts;
+	u32             num_isrs;
+	u32             false_interrupts;
+	u32             tx_packets;
+	u32             xmit_completes;
+	u32             tx_drops;
+	u32             rcv_broadcasts;
+	u32             rcv_multicasts;
+	u32             rcv_unicasts;
+	u32             max_isr_rcvs;
+	u32             max_isr_xmits;
+	u32             rcv_interrupt_yields;
+	u32             intagg_period;
+	struct inicpm_state    *inicpm_info;
+	void *pinicpm_info;
+	struct slic_reg_params   reg_params;
+	struct slic_ifevents  if_events;
+	struct slic_stats        inicstats_prev;
+	struct slicnet_stats     slic_stats;
 };
  
  
 #define UPDATE_STATS(largestat, newstat, oldstat)                        \
 {                                                                        \
-    if ((newstat) < (oldstat))                                           \
-	(largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1));         \
-    else                                                                 \
-	(largestat) += ((newstat) - (oldstat));                          \
+	if ((newstat) < (oldstat))                                       \
+		(largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1)); \
+	else                                                             \
+		(largestat) += ((newstat) - (oldstat));                  \
 }
  
 #define UPDATE_STATS_GB(largestat, newstat, oldstat)                     \
 {                                                                        \
-    (largestat) += ((newstat) - (oldstat));                              \
+	(largestat) += ((newstat) - (oldstat));                          \
 }
  
 #if BITS_PER_LONG == 64
@@ -450,7 +450,7 @@
 	u32	pad34;
 #define SLIC_DBAR64		0x0108
  
-	u32	slic_cbar64; 	/* 64 bit Xmt Cmd buf addr regs. */
+	u32	slic_cbar64;	/* 64 bit Xmt Cmd buf addr regs. */
 	u32	pad35;
 #define SLIC_CBAR64		0x0110
  
  
@@ -478,11 +478,11 @@
  
 	u32	slic_read_xf_info;	/* Read Transformer info */
 	u32	pad41;
-#define SLIC_READ_XF_INFO 	0x0140
+#define SLIC_READ_XF_INFO	0x0140
  
 	u32	slic_write_xf_info;	/* Write Transformer info */
 	u32	pad42;
-#define SLIC_WRITE_XF_INFO 	0x0148
+#define SLIC_WRITE_XF_INFO	0x0148
  
 	u32	RSVD1;		/* TOE Only */
 	u32	pad43;
@@ -144,24 +144,24 @@
  
 #define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)                   \
 {                                                                       \
-    spin_lock_irqsave(&_adapter->handle_lock.lock,                      \
+	spin_lock_irqsave(&_adapter->handle_lock.lock,                  \
 			_adapter->handle_lock.flags);                   \
-    _pslic_handle  =  _adapter->pfree_slic_handles;                     \
-    if (_pslic_handle) {                                                \
-	_adapter->pfree_slic_handles = _pslic_handle->next;             \
-    }                                                                   \
-    spin_unlock_irqrestore(&_adapter->handle_lock.lock,                 \
+	_pslic_handle  =  _adapter->pfree_slic_handles;                 \
+	if (_pslic_handle) {                                            \
+		_adapter->pfree_slic_handles = _pslic_handle->next;     \
+	}                                                               \
+	spin_unlock_irqrestore(&_adapter->handle_lock.lock,             \
 			_adapter->handle_lock.flags);                   \
 }
  
 #define SLIC_FREE_SLIC_HANDLE(_adapter, _pslic_handle)                  \
 {                                                                       \
-    _pslic_handle->type = SLIC_HANDLE_FREE;                             \
-    spin_lock_irqsave(&_adapter->handle_lock.lock,                      \
+	_pslic_handle->type = SLIC_HANDLE_FREE;                         \
+	spin_lock_irqsave(&_adapter->handle_lock.lock,                  \
 			_adapter->handle_lock.flags);                   \
-    _pslic_handle->next = _adapter->pfree_slic_handles;                 \
-    _adapter->pfree_slic_handles = _pslic_handle;                       \
-    spin_unlock_irqrestore(&_adapter->handle_lock.lock,                 \
+	_pslic_handle->next = _adapter->pfree_slic_handles;             \
+	_adapter->pfree_slic_handles = _pslic_handle;                   \
+	spin_unlock_irqrestore(&_adapter->handle_lock.lock,             \
 			_adapter->handle_lock.flags);                   \
 }
...	...	@@ -43,15 +43,15 @@
43	43
44	44	/* firmware stuff */
45	45	#define OASIS_UCODE_VERS_STRING "1.2"
46		-#define OASIS_UCODE_VERS_DATE "2006/03/27 15:10:37"
47		-#define OASIS_UCODE_HOSTIF_ID 3
	46	+#define OASIS_UCODE_VERS_DATE "2006/03/27 15:10:37"
	47	+#define OASIS_UCODE_HOSTIF_ID 3
48	48
49	49	#define MOJAVE_UCODE_VERS_STRING "1.2"
50		-#define MOJAVE_UCODE_VERS_DATE "2006/03/27 15:12:22"
51		-#define MOJAVE_UCODE_HOSTIF_ID 3
	50	+#define MOJAVE_UCODE_VERS_DATE "2006/03/27 15:12:22"
	51	+#define MOJAVE_UCODE_HOSTIF_ID 3
52	52
53	53	#define GB_RCVUCODE_VERS_STRING "1.2"
54		-#define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15"
	54	+#define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15"
55	55	static u32 OasisRcvUCodeLen = 512;
56	56	static u32 GBRcvUCodeLen = 512;
57	57	#define SECTION_SIZE 65536
...	...	@@ -65,12 +65,12 @@
65	65	#define SLIC_RSPQ_BUFSINPAGE (PAGE_SIZE / SLIC_RSPBUF_SIZE)
66	66
67	67	struct slic_rspqueue {
68		- u32 offset;
69		- u32 pageindex;
70		- u32 num_pages;
71		- struct slic_rspbuf *rspbuf;
72		- u32 *vaddr[SLIC_RSPQ_PAGES_GB];
73		- dma_addr_t paddr[SLIC_RSPQ_PAGES_GB];
	68	+ u32 offset;
	69	+ u32 pageindex;
	70	+ u32 num_pages;
	71	+ struct slic_rspbuf *rspbuf;
	72	+ u32 *vaddr[SLIC_RSPQ_PAGES_GB];
	73	+ dma_addr_t paddr[SLIC_RSPQ_PAGES_GB];
74	74	};
75	75
76	76	#define SLIC_RCVQ_EXPANSION 1
77	77
...	...	@@ -82,20 +82,20 @@
82	82	#define SLIC_RCVQ_FILLTHRESH (SLIC_RCVQ_ENTRIES - SLIC_RCVQ_FILLENTRIES)
83	83
84	84	struct slic_rcvqueue {
85		- struct sk_buff *head;
86		- struct sk_buff *tail;
87		- u32 count;
88		- u32 size;
89		- u32 errors;
	85	+ struct sk_buff *head;
	86	+ struct sk_buff *tail;
	87	+ u32 count;
	88	+ u32 size;
	89	+ u32 errors;
90	90	};
91	91
92	92	struct slic_rcvbuf_info {
93		- u32 id;
94		- u32 starttime;
95		- u32 stoptime;
96		- u32 slicworld;
97		- u32 lasttime;
98		- u32 lastid;
	93	+ u32 id;
	94	+ u32 starttime;
	95	+ u32 stoptime;
	96	+ u32 slicworld;
	97	+ u32 lasttime;
	98	+ u32 lastid;
99	99	};
100	100	/*
101	101	SLIC Handle structure. Used to restrict handle values to
...	...	@@ -113,12 +113,12 @@
113	113	};
114	114
115	115	struct slic_handle {
116		- struct slic_handle_word token; /* token passed between host and card*/
117		- ushort type;
118		- void address; / actual address of the object*/
119		- ushort offset;
120		- struct slic_handle *other_handle;
121		- struct slic_handle *next;
	116	+ struct slic_handle_word token; /* token passed between host and card*/
	117	+ ushort type;
	118	+ void address; / actual address of the object*/
	119	+ ushort offset;
	120	+ struct slic_handle *other_handle;
	121	+ struct slic_handle *next;
122	122	};
123	123
124	124	#define SLIC_HANDLE_FREE 0x0000
...	...	@@ -134,17 +134,17 @@
134	134	#define SLIC_HOSTCMD_SIZE 512
135	135
136	136	struct slic_hostcmd {
137		- struct slic_host64_cmd cmd64;
138		- u32 type;
139		- struct sk_buff *skb;
140		- u32 paddrl;
141		- u32 paddrh;
142		- u32 busy;
143		- u32 cmdsize;
144		- ushort numbufs;
145		- struct slic_handle pslic_handle;/ handle associated with command */
146		- struct slic_hostcmd *next;
147		- struct slic_hostcmd *next_all;
	137	+ struct slic_host64_cmd cmd64;
	138	+ u32 type;
	139	+ struct sk_buff *skb;
	140	+ u32 paddrl;
	141	+ u32 paddrh;
	142	+ u32 busy;
	143	+ u32 cmdsize;
	144	+ ushort numbufs;
	145	+ struct slic_handle pslic_handle;/ handle associated with command */
	146	+ struct slic_hostcmd *next;
	147	+ struct slic_hostcmd *next_all;
148	148	};
149	149
150	150	#define SLIC_CMDQ_CMDSINPAGE (PAGE_SIZE / SLIC_HOSTCMD_SIZE)
151	151
152	152
...	...	@@ -228,35 +228,35 @@
228	228	#define SLIC_CARD_STATE(x) ((x == CARD_UP) ? "UP" : "Down")
229	229
230	230	struct slic_iface_stats {
231		- /*
232		- * Stats
233		- */
234		- u64 xmt_bytes;
235		- u64 xmt_ucast;
236		- u64 xmt_mcast;
237		- u64 xmt_bcast;
238		- u64 xmt_errors;
239		- u64 xmt_discards;
240		- u64 xmit_collisions;
241		- u64 xmit_excess_xmit_collisions;
242		- u64 rcv_bytes;
243		- u64 rcv_ucast;
244		- u64 rcv_mcast;
245		- u64 rcv_bcast;
246		- u64 rcv_errors;
247		- u64 rcv_discards;
	231	+ /*
	232	+ * Stats
	233	+ */
	234	+ u64 xmt_bytes;
	235	+ u64 xmt_ucast;
	236	+ u64 xmt_mcast;
	237	+ u64 xmt_bcast;
	238	+ u64 xmt_errors;
	239	+ u64 xmt_discards;
	240	+ u64 xmit_collisions;
	241	+ u64 xmit_excess_xmit_collisions;
	242	+ u64 rcv_bytes;
	243	+ u64 rcv_ucast;
	244	+ u64 rcv_mcast;
	245	+ u64 rcv_bcast;
	246	+ u64 rcv_errors;
	247	+ u64 rcv_discards;
248	248	};
249	249
250	250	struct sliccp_stats {
251		- u64 xmit_tcp_segs;
252		- u64 xmit_tcp_bytes;
253		- u64 rcv_tcp_segs;
254		- u64 rcv_tcp_bytes;
	251	+ u64 xmit_tcp_segs;
	252	+ u64 xmit_tcp_bytes;
	253	+ u64 rcv_tcp_segs;
	254	+ u64 rcv_tcp_bytes;
255	255	};
256	256
257	257	struct slicnet_stats {
258		- struct sliccp_stats tcp;
259		- struct slic_iface_stats iface;
	258	+ struct sliccp_stats tcp;
	259	+ struct slic_iface_stats iface;
260	260	};
261	261
262	262	#define SLIC_LOADTIMER_PERIOD 1
263	263
...	...	@@ -285,51 +285,51 @@
285	285	#define SLIC_INTAGG_5GB 100
286	286
287	287	struct ether_header {
288		- unsigned char ether_dhost[6];
289		- unsigned char ether_shost[6];
290		- ushort ether_type;
	288	+ unsigned char ether_dhost[6];
	289	+ unsigned char ether_shost[6];
	290	+ ushort ether_type;
291	291	};
292	292
293	293	struct sliccard {
294		- uint busnumber;
295		- uint slotnumber;
296		- uint state;
297		- uint cardnum;
298		- uint card_size;
299		- uint adapters_activated;
300		- uint adapters_allocated;
301		- uint adapters_sleeping;
302		- uint gennumber;
303		- u32 events;
304		- u32 loadlevel_current;
305		- u32 load;
306		- uint reset_in_progress;
307		- u32 pingstatus;
308		- u32 bad_pingstatus;
309		- struct timer_list loadtimer;
310		- u32 loadtimerset;
311		- uint config_set;
312		- struct slic_config config;
313		- struct dentry *debugfs_dir;
314		- struct dentry *debugfs_cardinfo;
315		- struct adapter *master;
316		- struct adapter *adapter[SLIC_MAX_PORTS];
317		- struct sliccard *next;
318		- u32 error_interrupts;
319		- u32 error_rmiss_interrupts;
320		- u32 rcv_interrupts;
321		- u32 xmit_interrupts;
322		- u32 num_isrs;
323		- u32 false_interrupts;
324		- u32 max_isr_rcvs;
325		- u32 max_isr_xmits;
326		- u32 rcv_interrupt_yields;
327		- u32 tx_packets;
328		- u32 debug_ix;
329		- ushort reg_type[32];
330		- ushort reg_offset[32];
331		- u32 reg_value[32];
332		- u32 reg_valueh[32];
	294	+ uint busnumber;
	295	+ uint slotnumber;
	296	+ uint state;
	297	+ uint cardnum;
	298	+ uint card_size;
	299	+ uint adapters_activated;
	300	+ uint adapters_allocated;
	301	+ uint adapters_sleeping;
	302	+ uint gennumber;
	303	+ u32 events;
	304	+ u32 loadlevel_current;
	305	+ u32 load;
	306	+ uint reset_in_progress;
	307	+ u32 pingstatus;
	308	+ u32 bad_pingstatus;
	309	+ struct timer_list loadtimer;
	310	+ u32 loadtimerset;
	311	+ uint config_set;
	312	+ struct slic_config config;
	313	+ struct dentry *debugfs_dir;
	314	+ struct dentry *debugfs_cardinfo;
	315	+ struct adapter *master;
	316	+ struct adapter *adapter[SLIC_MAX_PORTS];
	317	+ struct sliccard *next;
	318	+ u32 error_interrupts;
	319	+ u32 error_rmiss_interrupts;
	320	+ u32 rcv_interrupts;
	321	+ u32 xmit_interrupts;
	322	+ u32 num_isrs;
	323	+ u32 false_interrupts;
	324	+ u32 max_isr_rcvs;
	325	+ u32 max_isr_xmits;
	326	+ u32 rcv_interrupt_yields;
	327	+ u32 tx_packets;
	328	+ u32 debug_ix;
	329	+ ushort reg_type[32];
	330	+ ushort reg_offset[32];
	331	+ u32 reg_value[32];
	332	+ u32 reg_valueh[32];
333	333	};
334	334
335	335	#define NUM_CFG_SPACES 2
336	336
337	337
338	338
339	339
340	340
341	341
342	342
343	343
344	344
345	345
...	...	@@ -337,182 +337,182 @@
337	337	#define NUM_CFG_REG_ULONGS (NUM_CFG_REGS / sizeof(u32))
338	338
339	339	struct physcard {
340		- struct adapter *adapter[SLIC_MAX_PORTS];
341		- struct physcard *next;
342		- uint adapters_allocd;
	340	+ struct adapter *adapter[SLIC_MAX_PORTS];
	341	+ struct physcard *next;
	342	+ uint adapters_allocd;
343	343
344		- /* the following is not currently needed
345		- u32 bridge_busnum;
346		- u32 bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];
347		- */
	344	+/* the following is not currently needed
	345	+ u32 bridge_busnum;
	346	+ u32 bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];
	347	+*/
348	348	};
349	349
350	350	struct base_driver {
351		- struct slic_spinlock driver_lock;
352		- u32 num_slic_cards;
353		- u32 num_slic_ports;
354		- u32 num_slic_ports_active;
355		- u32 dynamic_intagg;
356		- struct sliccard *slic_card;
357		- struct physcard *phys_card;
358		- uint cardnuminuse[SLIC_MAX_CARDS];
	351	+ struct slic_spinlock driver_lock;
	352	+ u32 num_slic_cards;
	353	+ u32 num_slic_ports;
	354	+ u32 num_slic_ports_active;
	355	+ u32 dynamic_intagg;
	356	+ struct sliccard *slic_card;
	357	+ struct physcard *phys_card;
	358	+ uint cardnuminuse[SLIC_MAX_CARDS];
359	359	};
360	360
361	361	struct slic_shmem {
362		- volatile u32 isr;
363		- volatile u32 linkstatus;
364		- volatile struct slic_stats inicstats;
	362	+ volatile u32 isr;
	363	+ volatile u32 linkstatus;
	364	+ volatile struct slic_stats inicstats;
365	365	};
366	366
367	367	struct slic_reg_params {
368		- u32 linkspeed;
369		- u32 linkduplex;
370		- u32 fail_on_bad_eeprom;
	368	+ u32 linkspeed;
	369	+ u32 linkduplex;
	370	+ u32 fail_on_bad_eeprom;
371	371	};
372	372
373	373	struct slic_upr {
374		- uint adapter;
375		- u32 upr_request;
376		- u32 upr_data;
377		- u32 upr_data_h;
378		- u32 upr_buffer;
379		- u32 upr_buffer_h;
380		- struct slic_upr *next;
	374	+ uint adapter;
	375	+ u32 upr_request;
	376	+ u32 upr_data;
	377	+ u32 upr_data_h;
	378	+ u32 upr_buffer;
	379	+ u32 upr_buffer_h;
	380	+ struct slic_upr *next;
381	381	};
382	382
383	383	struct slic_ifevents {
384		- uint oflow802;
385		- uint uflow802;
386		- uint Tprtoflow;
387		- uint rcvearly;
388		- uint Bufov;
389		- uint Carre;
390		- uint Longe;
391		- uint Invp;
392		- uint Crc;
393		- uint Drbl;
394		- uint Code;
395		- uint IpHlen;
396		- uint IpLen;
397		- uint IpCsum;
398		- uint TpCsum;
399		- uint TpHlen;
	384	+ uint oflow802;
	385	+ uint uflow802;
	386	+ uint Tprtoflow;
	387	+ uint rcvearly;
	388	+ uint Bufov;
	389	+ uint Carre;
	390	+ uint Longe;
	391	+ uint Invp;
	392	+ uint Crc;
	393	+ uint Drbl;
	394	+ uint Code;
	395	+ uint IpHlen;
	396	+ uint IpLen;
	397	+ uint IpCsum;
	398	+ uint TpCsum;
	399	+ uint TpHlen;
400	400	};
401	401
402	402	struct adapter {
403		- void *ifp;
404		- struct sliccard *card;
405		- uint port;
406		- struct physcard *physcard;
407		- uint physport;
408		- uint cardindex;
409		- uint card_size;
410		- uint chipid;
411		- struct net_device *netdev;
412		- struct net_device *next_netdevice;
413		- struct slic_spinlock adapter_lock;
414		- struct slic_spinlock reset_lock;
415		- struct pci_dev *pcidev;
416		- uint busnumber;
417		- uint slotnumber;
418		- uint functionnumber;
419		- ushort vendid;
420		- ushort devid;
421		- ushort subsysid;
422		- u32 irq;
423		- void __iomem *memorybase;
424		- u32 memorylength;
425		- u32 drambase;
426		- u32 dramlength;
427		- uint queues_initialized;
428		- uint allocated;
429		- uint activated;
430		- u32 intrregistered;
431		- uint isp_initialized;
432		- uint gennumber;
433		- u32 curaddrupper;
434		- struct slic_shmem *pshmem;
435		- dma_addr_t phys_shmem;
436		- u32 isrcopy;
437		- __iomem struct slic_regs *slic_regs;
438		- unsigned char state;
439		- unsigned char linkstate;
440		- unsigned char linkspeed;
441		- unsigned char linkduplex;
442		- uint flags;
443		- unsigned char macaddr[6];
444		- unsigned char currmacaddr[6];
445		- u32 macopts;
446		- ushort devflags_prev;
447		- u64 mcastmask;
448		- struct mcast_address *mcastaddrs;
449		- struct slic_upr *upr_list;
450		- uint upr_busy;
451		- struct timer_list pingtimer;
452		- u32 pingtimerset;
453		- struct timer_list loadtimer;
454		- u32 loadtimerset;
455		- struct dentry *debugfs_entry;
456		- struct slic_spinlock upr_lock;
457		- struct slic_spinlock bit64reglock;
458		- struct slic_rspqueue rspqueue;
459		- struct slic_rcvqueue rcvqueue;
460		- struct slic_cmdqueue cmdq_free;
461		- struct slic_cmdqueue cmdq_done;
462		- struct slic_cmdqueue cmdq_all;
463		- struct slic_cmdqmem cmdqmem;
464		- /*
465		- * SLIC Handles
466		- */
467		- struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS+1]; /* Object handles*/
468		- struct slic_handle pfree_slic_handles; / Free object handles*/
469		- struct slic_spinlock handle_lock; /* Object handle list lock*/
470		- ushort slic_handle_ix;
	403	+ void *ifp;
	404	+ struct sliccard *card;
	405	+ uint port;
	406	+ struct physcard *physcard;
	407	+ uint physport;
	408	+ uint cardindex;
	409	+ uint card_size;
	410	+ uint chipid;
	411	+ struct net_device *netdev;
	412	+ struct net_device *next_netdevice;
	413	+ struct slic_spinlock adapter_lock;
	414	+ struct slic_spinlock reset_lock;
	415	+ struct pci_dev *pcidev;
	416	+ uint busnumber;
	417	+ uint slotnumber;
	418	+ uint functionnumber;
	419	+ ushort vendid;
	420	+ ushort devid;
	421	+ ushort subsysid;
	422	+ u32 irq;
	423	+ void __iomem *memorybase;
	424	+ u32 memorylength;
	425	+ u32 drambase;
	426	+ u32 dramlength;
	427	+ uint queues_initialized;
	428	+ uint allocated;
	429	+ uint activated;
	430	+ u32 intrregistered;
	431	+ uint isp_initialized;
	432	+ uint gennumber;
	433	+ u32 curaddrupper;
	434	+ struct slic_shmem *pshmem;
	435	+ dma_addr_t phys_shmem;
	436	+ u32 isrcopy;
	437	+ __iomem struct slic_regs *slic_regs;
	438	+ unsigned char state;
	439	+ unsigned char linkstate;
	440	+ unsigned char linkspeed;
	441	+ unsigned char linkduplex;
	442	+ uint flags;
	443	+ unsigned char macaddr[6];
	444	+ unsigned char currmacaddr[6];
	445	+ u32 macopts;
	446	+ ushort devflags_prev;
	447	+ u64 mcastmask;
	448	+ struct mcast_address *mcastaddrs;
	449	+ struct slic_upr *upr_list;
	450	+ uint upr_busy;
	451	+ struct timer_list pingtimer;
	452	+ u32 pingtimerset;
	453	+ struct timer_list loadtimer;
	454	+ u32 loadtimerset;
	455	+ struct dentry *debugfs_entry;
	456	+ struct slic_spinlock upr_lock;
	457	+ struct slic_spinlock bit64reglock;
	458	+ struct slic_rspqueue rspqueue;
	459	+ struct slic_rcvqueue rcvqueue;
	460	+ struct slic_cmdqueue cmdq_free;
	461	+ struct slic_cmdqueue cmdq_done;
	462	+ struct slic_cmdqueue cmdq_all;
	463	+ struct slic_cmdqmem cmdqmem;
	464	+ /*
	465	+ * SLIC Handles
	466	+ */
	467	+ struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS+1]; /* Object handles*/
	468	+ struct slic_handle pfree_slic_handles; / Free object handles*/
	469	+ struct slic_spinlock handle_lock; /* Object handle list lock*/
	470	+ ushort slic_handle_ix;
471	471
472		- u32 xmitq_full;
473		- u32 all_reg_writes;
474		- u32 icr_reg_writes;
475		- u32 isr_reg_writes;
476		- u32 error_interrupts;
477		- u32 error_rmiss_interrupts;
478		- u32 rx_errors;
479		- u32 rcv_drops;
480		- u32 rcv_interrupts;
481		- u32 xmit_interrupts;
482		- u32 linkevent_interrupts;
483		- u32 upr_interrupts;
484		- u32 num_isrs;
485		- u32 false_interrupts;
486		- u32 tx_packets;
487		- u32 xmit_completes;
488		- u32 tx_drops;
489		- u32 rcv_broadcasts;
490		- u32 rcv_multicasts;
491		- u32 rcv_unicasts;
492		- u32 max_isr_rcvs;
493		- u32 max_isr_xmits;
494		- u32 rcv_interrupt_yields;
495		- u32 intagg_period;
496		- struct inicpm_state *inicpm_info;
497		- void *pinicpm_info;
498		- struct slic_reg_params reg_params;
499		- struct slic_ifevents if_events;
500		- struct slic_stats inicstats_prev;
501		- struct slicnet_stats slic_stats;
	472	+ u32 xmitq_full;
	473	+ u32 all_reg_writes;
	474	+ u32 icr_reg_writes;
	475	+ u32 isr_reg_writes;
	476	+ u32 error_interrupts;
	477	+ u32 error_rmiss_interrupts;
	478	+ u32 rx_errors;
	479	+ u32 rcv_drops;
	480	+ u32 rcv_interrupts;
	481	+ u32 xmit_interrupts;
	482	+ u32 linkevent_interrupts;
	483	+ u32 upr_interrupts;
	484	+ u32 num_isrs;
	485	+ u32 false_interrupts;
	486	+ u32 tx_packets;
	487	+ u32 xmit_completes;
	488	+ u32 tx_drops;
	489	+ u32 rcv_broadcasts;
	490	+ u32 rcv_multicasts;
	491	+ u32 rcv_unicasts;
	492	+ u32 max_isr_rcvs;
	493	+ u32 max_isr_xmits;
	494	+ u32 rcv_interrupt_yields;
	495	+ u32 intagg_period;
	496	+ struct inicpm_state *inicpm_info;
	497	+ void *pinicpm_info;
	498	+ struct slic_reg_params reg_params;
	499	+ struct slic_ifevents if_events;
	500	+ struct slic_stats inicstats_prev;
	501	+ struct slicnet_stats slic_stats;
502	502	};
503	503
504	504
505	505	#define UPDATE_STATS(largestat, newstat, oldstat) \
506	506	{ \
507		- if ((newstat) < (oldstat)) \
508		- (largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1)); \
509		- else \
510		- (largestat) += ((newstat) - (oldstat)); \
	507	+ if ((newstat) < (oldstat)) \
	508	+ (largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1)); \
	509	+ else \
	510	+ (largestat) += ((newstat) - (oldstat)); \
511	511	}
512	512
513	513	#define UPDATE_STATS_GB(largestat, newstat, oldstat) \
514	514	{ \
515		- (largestat) += ((newstat) - (oldstat)); \
	515	+ (largestat) += ((newstat) - (oldstat)); \
516	516	}
517	517
518	518	#if BITS_PER_LONG == 64
...	...	@@ -450,7 +450,7 @@
450	450	u32 pad34;
451	451	#define SLIC_DBAR64 0x0108
452	452
453		- u32 slic_cbar64; /* 64 bit Xmt Cmd buf addr regs. */
	453	+ u32 slic_cbar64; /* 64 bit Xmt Cmd buf addr regs. */
454	454	u32 pad35;
455	455	#define SLIC_CBAR64 0x0110
456	456
457	457
...	...	@@ -478,11 +478,11 @@
478	478
479	479	u32 slic_read_xf_info; /* Read Transformer info */
480	480	u32 pad41;
481		-#define SLIC_READ_XF_INFO 0x0140
	481	+#define SLIC_READ_XF_INFO 0x0140
482	482
483	483	u32 slic_write_xf_info; /* Write Transformer info */
484	484	u32 pad42;
485		-#define SLIC_WRITE_XF_INFO 0x0148
	485	+#define SLIC_WRITE_XF_INFO 0x0148
486	486
487	487	u32 RSVD1; /* TOE Only */
488	488	u32 pad43;
...	...	@@ -144,24 +144,24 @@
144	144
145	145	#define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle) \
146	146	{ \
147		- spin_lock_irqsave(&_adapter->handle_lock.lock, \
	147	+ spin_lock_irqsave(&_adapter->handle_lock.lock, \
148	148	_adapter->handle_lock.flags); \
149		- _pslic_handle = _adapter->pfree_slic_handles; \
150		- if (_pslic_handle) { \
151		- _adapter->pfree_slic_handles = _pslic_handle->next; \
152		- } \
153		- spin_unlock_irqrestore(&_adapter->handle_lock.lock, \
	149	+ _pslic_handle = _adapter->pfree_slic_handles; \
	150	+ if (_pslic_handle) { \
	151	+ _adapter->pfree_slic_handles = _pslic_handle->next; \
	152	+ } \
	153	+ spin_unlock_irqrestore(&_adapter->handle_lock.lock, \
154	154	_adapter->handle_lock.flags); \
155	155	}
156	156
157	157	#define SLIC_FREE_SLIC_HANDLE(_adapter, _pslic_handle) \
158	158	{ \
159		- _pslic_handle->type = SLIC_HANDLE_FREE; \
160		- spin_lock_irqsave(&_adapter->handle_lock.lock, \
	159	+ _pslic_handle->type = SLIC_HANDLE_FREE; \
	160	+ spin_lock_irqsave(&_adapter->handle_lock.lock, \
161	161	_adapter->handle_lock.flags); \
162		- _pslic_handle->next = _adapter->pfree_slic_handles; \
163		- _adapter->pfree_slic_handles = _pslic_handle; \
164		- spin_unlock_irqrestore(&_adapter->handle_lock.lock, \
	162	+ _pslic_handle->next = _adapter->pfree_slic_handles; \
	163	+ _adapter->pfree_slic_handles = _pslic_handle; \
	164	+ spin_unlock_irqrestore(&_adapter->handle_lock.lock, \
165	165	_adapter->handle_lock.flags); \
166	166	}
167	167