Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv30387/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c
Log Message:
Merge with 2.5.42
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 20 Mar 2003 00:44:42 -0000 1.11
+++ Makefile 22 Mar 2003 19:49:41 -0000 1.12
@@ -143,7 +143,7 @@
$(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h
$(obj)/53c7xx.o: $(obj)/53c7xx_d.h $(obj)/53c7xx_u.h
$(obj)/sim710.o: $(obj)/sim710_d.h
-$(obj)/53c700.o $(MODVERDIR)/53c700.ver: $(obj)/53c700_d.h
+$(obj)/53c700.o $(MODVERDIR)/$(obj)/53c700.ver: $(obj)/53c700_d.h
# If you want to play with the firmware, uncomment
# GENERATE_FIRMWARE := 1
@@ -168,4 +168,4 @@
$(obj)/53c700_d.h: $(src)/53c700.scr $(src)/script_asm.pl
$(PERL) -s $(src)/script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h) < $<
-endif
\ No newline at end of file
+endif
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scsi_ioctl.c 12 Mar 2003 23:39:25 -0000 1.7
+++ scsi_ioctl.c 22 Mar 2003 19:49:41 -0000 1.8
@@ -431,6 +431,14 @@
return 0;
case SCSI_IOCTL_GET_BUS_NUMBER:
return put_user(dev->host->host_no, (int *) arg);
+ /*
+ * The next two ioctls either need to go or need to be changed to
+ * pass tagged queueing changes through the low level drivers.
+ * Simply enabling or disabling tagged queueing without the knowledge
+ * of the low level driver is a *BAD* thing.
+ *
+ * Oct. 10, 2002 - Doug Ledford <dle...@re...>
+ */
case SCSI_IOCTL_TAGGED_ENABLE:
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
|
