Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/drivers/net/skfp drvfbi.c,1.1.1.1,1.2 ess.c,1.1.1.1,1.2 fplustm.c,1.1.1.1,1.2 pcmplc.c,1.1.1.1,1.2 skfddi.c,1.1.1.2,1.2 srf.c,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-11 14:36:37
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp
In directory usw-pr-cvs1:/tmp/cvs-serv30336/net/skfp
Modified Files:
drvfbi.c ess.c fplustm.c pcmplc.c skfddi.c srf.c
Log Message:
synch 2.4.15 commit 50
Index: drvfbi.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/drvfbi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- drvfbi.c 14 Jan 2001 17:40:25 -0000 1.1.1.1
+++ drvfbi.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -849,7 +849,7 @@
#ifdef EISA
-/*arrays with io adresses of dma controller length and adress registers*/
+/*arrays with io addresses of dma controller length and address registers*/
static const int cntr[8] = { 0x001,0x003,0x005,0x007,0,0x0c6,0x0ca,0x0ce } ;
static const int base[8] = { 0x000,0x002,0x004,0x006,0,0x0c4,0x0c8,0x0cc } ;
static const int page[8] = { 0x087,0x083,0x081,0x082,0,0x08b,0x089,0x08a } ;
Index: ess.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/ess.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ess.c 14 Jan 2001 17:40:29 -0000 1.1.1.1
+++ ess.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -258,8 +258,16 @@
* Extract message parameters
*/
p = (void *) sm_to_para(smc,sm,SMT_P320F) ;
+ if (!p) {
+ printk(KERN_ERR "ESS: sm_to_para failed");
+ return fs;
+ }
payload = ((struct smt_p_320f *)p)->mib_payload ;
p = (void *) sm_to_para(smc,sm,SMT_P3210) ;
+ if (!p) {
+ printk(KERN_ERR "ESS: sm_to_para failed");
+ return fs;
+ }
overhead = ((struct smt_p_3210 *)p)->mib_overhead ;
DB_ESSN(2,"payload= %lx overhead= %lx\n",payload,overhead) ;
Index: fplustm.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/fplustm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fplustm.c 14 Jan 2001 17:40:35 -0000 1.1.1.1
+++ fplustm.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -87,7 +87,7 @@
/*
- * usefull interrupt bits
+ * useful interrupt bits
*/
static int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ;
static int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0|
@@ -1381,7 +1381,7 @@
CHECK_CAM() ;
/*
- * wirte the multicast addres into the CAM
+ * write the multicast address into the CAM
*/
outpw(FM_A(FM_AFCOMP2),
(u_short)((tb->a.a[0]<<8)+tb->a.a[1])) ;
Index: pcmplc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/pcmplc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pcmplc.c 14 Jan 2001 17:40:51 -0000 1.1.1.1
+++ pcmplc.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -1722,7 +1722,7 @@
}
if (cmd & PL_EBUF_ERR) { /* elastic buff. det. over-|underflow*/
/*
- * Check whether the SRF Condition occured.
+ * Check whether the SRF Condition occurred.
*/
if (!plc->ebuf_cont && phy->mib->fddiPORTPCMState == PC8_ACTIVE){
/*
Index: skfddi.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/skfddi.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- skfddi.c 25 Feb 2001 23:15:00 -0000 1.1.1.2
+++ skfddi.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -182,12 +182,18 @@
extern void enable_tx_irq(struct s_smc *smc, u_short queue);
extern void mac_drv_clear_txd(struct s_smc *smc);
+static struct pci_device_id skfddi_pci_tbl[] __initdata = {
+ { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, },
+ { } /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, skfddi_pci_tbl);
+MODULE_LICENSE("GPL");
// Define module-wide (static) variables
-static int num_boards = 0; /* total number of adapters configured */
-static int num_fddi = 0;
-static int autoprobed = 0;
+static int num_boards; /* total number of adapters configured */
+static int num_fddi;
+static int autoprobed;
#ifdef MODULE
int init_module(void);
@@ -195,7 +201,7 @@
static struct net_device *unlink_modules(struct net_device *p);
static int loading_module = 1;
#else
-static int loading_module = 0;
+static int loading_module;
#endif // MODULE
#ifdef DRIVERDEBUG
@@ -1632,7 +1638,7 @@
* This function is called by the hardware dependent module.
* It allocates the memory for the RxD and TxD descriptors.
*
- * This memory must be non-cached, non-movable and non-swapable.
+ * This memory must be non-cached, non-movable and non-swappable.
* This memory should start at a physical page boundary.
* Args
* smc - A pointer to the SMT context struct.
@@ -2552,7 +2558,7 @@
*
************************/
#define LP(a) ((struct s_smc*)(a))
-static struct net_device *mdev = NULL;
+static struct net_device *mdev;
/************************
*
Index: srf.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/srf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- srf.c 14 Jan 2001 17:41:21 -0000 1.1.1.1
+++ srf.c 11 Apr 2002 12:37:50 -0000 1.2
@@ -197,7 +197,7 @@
struct s_srf_evc *evc ;
int cond_asserted = 0 ;
int cond_deasserted = 0 ;
- int event_occured = 0 ;
+ int event_occurred = 0 ;
int tsr ;
int T_Limit = 2*TICKS_PER_SECOND ;
@@ -246,7 +246,7 @@
*evc->evc_multiple = FALSE ;
}
smc->srf.any_report = TRUE ;
- event_occured = TRUE ;
+ event_occurred = TRUE ;
}
#ifdef FDDI_MIB
snmp_srf_event(smc,evc) ;
@@ -268,7 +268,7 @@
break ;
}
/* SR01c */
- if (event_occured && tsr < T_Limit) {
+ if (event_occurred && tsr < T_Limit) {
smc->srf.sr_state = SR1_HOLDOFF ;
break ;
}
@@ -286,7 +286,7 @@
break ;
}
/* SR00d */
- if (event_occured && tsr >= T_Limit) {
+ if (event_occurred && tsr >= T_Limit) {
smc->srf.TSR = smt_get_time() ;
smt_send_srf(smc) ;
break ;
|
