Update of /cvsroot/linux-vax/kernel-2.4/drivers/net/fc
In directory usw-pr-cvs1:/tmp/cvs-serv30336/net/fc
Modified Files:
iph5526.c tach.h
Log Message:
synch 2.4.15 commit 50
Index: iph5526.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/fc/iph5526.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- iph5526.c 25 Feb 2001 23:15:01 -0000 1.1.1.2
+++ iph5526.c 11 Apr 2002 12:37:47 -0000 1.2
@@ -118,6 +118,8 @@
};
MODULE_DEVICE_TABLE(pci, iph5526_pci_tbl);
+MODULE_LICENSE("GPL");
+
#define MAX_FC_CARDS 2
static struct fc_info *fc[MAX_FC_CARDS+1];
static unsigned int pci_irq_line;
@@ -222,7 +224,7 @@
static int get_scsi_oxid(struct fc_info *fi);
static void update_scsi_oxid(struct fc_info *fi);
-Scsi_Host_Template driver_template = IPH5526_SCSI_FC;
+static Scsi_Host_Template driver_template = IPH5526_SCSI_FC;
static void iph5526_timeout(struct net_device *dev);
@@ -241,7 +243,7 @@
struct fc_info *fi = (struct fc_info *)dev->priv;
#else
struct fc_info *fi;
- static int count = 0;
+ static int count;
if(fc[count] != NULL) {
if (dev == NULL) {
@@ -1074,11 +1076,11 @@
fi->fc_stats.rx_dropped++;
fi->g.mfs_buffer_count += no_of_buffers;
if (fi->g.mfs_buffer_count >= NO_OF_ENTRIES) {
- int count = fi->g.mfs_buffer_count / NO_OF_ENTRIES;
+ int count = fi->g.mfs_buffer_count / NO_OF_ENTRIES;
fi->g.mfs_buffer_count -= NO_OF_ENTRIES * count;
update_MFSBQ_indx(fi, count);
- return;
}
+ return;
}
if (wrap_around) {
int wrap_size = no_of_wrap_buffs * MFS_BUFFER_SIZE;
@@ -1930,7 +1932,7 @@
fi->g.name_server = FALSE;
fi->g.alpa_list_index = 0;
fi->g.ox_id = NOT_SCSI_XID;
- fi->g.my_mtu = FRAME_SIZE;
+ fi->g.my_mtu = TACH_FRAME_SIZE;
/* Implicitly LOGO with all logged-in nodes.
*/
@@ -2809,7 +2811,7 @@
else
if (logi == ELS_FLOGI)
fi->g.login.common_features = htons(FLOGI_C_F);
- fi->g.login.recv_data_field_size = htons(FRAME_SIZE);
+ fi->g.login.recv_data_field_size = htons(TACH_FRAME_SIZE);
fi->g.login.n_port_total_conc_seq = htons(CONCURRENT_SEQUENCES);
fi->g.login.rel_off_by_info_cat = htons(RO_INFO_CATEGORY);
fi->g.login.ED_TOV = htonl(E_D_TOV);
@@ -2845,7 +2847,7 @@
fi->g.login.c_of_s[2].service_options = htons(SERVICE_VALID);
fi->g.login.c_of_s[2].initiator_ctl = htons(0);
fi->g.login.c_of_s[2].recipient_ctl = htons(0);
- fi->g.login.c_of_s[2].recv_data_field_size = htons(FRAME_SIZE);
+ fi->g.login.c_of_s[2].recv_data_field_size = htons(TACH_FRAME_SIZE);
fi->g.login.c_of_s[2].concurrent_sequences = htons(CLASS3_CONCURRENT_SEQUENCE);
fi->g.login.c_of_s[2].n_port_end_to_end_credit = htons(0);
fi->g.login.c_of_s[2].open_seq_per_exchange = htons(CLASS3_OPEN_SEQUENCE);
@@ -4523,9 +4525,9 @@
static struct net_device *dev_fc[MAX_FC_CARDS];
-static int io = 0;
-static int irq = 0;
-static int bad = 0; /* 0xbad = bad sig or no reset ack */
+static int io;
+static int irq;
+static int bad; /* 0xbad = bad sig or no reset ack */
static int scsi_registered;
Index: tach.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/fc/tach.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tach.h 14 Jan 2001 17:45:18 -0000 1.1.1.1
+++ tach.h 11 Apr 2002 12:37:47 -0000 1.2
@@ -94,9 +94,9 @@
/* Size of the various buffers.
*/
-#define FRAME_SIZE 2048
-#define MFS_BUFFER_SIZE FRAME_SIZE
-#define SFS_BUFFER_SIZE (FRAME_SIZE + TACHYON_HEADER_LEN)
+#define TACH_FRAME_SIZE 2048
+#define MFS_BUFFER_SIZE TACH_FRAME_SIZE
+#define SFS_BUFFER_SIZE (TACH_FRAME_SIZE + TACHYON_HEADER_LEN)
#define SEST_BUFFER_SIZE 512
#define TACH_HEADER_SIZE 64
#define NO_OF_TACH_HEADERS ((MY_PAGE_SIZE)/TACH_HEADER_SIZE)
|
