lkml.org 
[lkml]   [2001]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] iph5526.c namespace fix.

The iph5526 driver uses a 'FRAME_SIZE' define, which redefines the
definition in asm-i386/ptrace.h The patch below changes it to
something less generic sounding.

regards,

Dave.

diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/fc/iph5526.c linux-dj/drivers/net/fc/iph5526.c
--- linux/drivers/net/fc/iph5526.c Fri Sep 14 00:04:43 2001
+++ linux-dj/drivers/net/fc/iph5526.c Mon Sep 24 21:35:09 2001
@@ -1932,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.
*/
@@ -2811,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);
@@ -2847,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);
diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/fc/tach.h linux-dj/drivers/net/fc/tach.h
--- linux/drivers/net/fc/tach.h Mon Aug 23 18:12:38 1999
+++ linux-dj/drivers/net/fc/tach.h Mon Sep 24 21:34:28 2001
@@ -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)

--
| Dave Jones. http://www.suse.de/~davej
| SuSE Labs

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:03    [W:0.025 / U:30.936 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site