patches/nicdrv-03-tu.diff
author trisk
Sat, 21 Feb 2009 21:13:55 +0000
changeset 1698 831894410112
parent 884 5adce97cae67
permissions -rw-r--r--
2009-02-21 Albert Lee <[email protected]> * SFEcuetools: *NEW* cuetools - utilities for working with cue files and TOC files * SFElogjam.spec: *NEW* LogJam - graphical client for LiveJournal-based sites * SFEnicdrv.spec: Update to vfe-2.6.4, rf-2.6.2, alta-2.6.3, bfe-2.6.1, ife-2.6.1, epfe-2.6.1, ae-2.6.1, gani-2.6.3, vel-2.6.4, nfo-2.6.3, myk-2.6.6, atge-2.6.3. Add jmge driver. Update GLD headers for Crossbow - requires b106 or later due to 6784639. Fix GLDv3/Crossbow support for several drivers. Update patch8 to fix GEM 2.4 and 2.6 bugs. * patches/logjam-01-debian.diff: Misc fixes from Debian * patches/logjam-02-timegm.diff: Fix timegm() usage * patches/nicdrv-02-rf.diff: Update for rf-2.6.2 * patches/nicdrv-03-tu.diff: Add GLDv3 fix * patches/nicdrv-04-gani.diff: Update for gani-2.6.3, add misc fixes * patches/nicdrv-05-myk.diff: Update for myk-2.6.6 * patches/nicdrv-06-ife.diff: Update for ife-2.6.1, add misc fixes * patches/nicdrv-08-gldv3.diff: Fix GEM 2.4 and 2.6 bugs * patches/nicdrv-09-nfo.diff, patches/nicdrv-10-atge.diff, patches/nicdrv-11-jmge.diff: Fix adddrv.sh * patches/nicdrv-12-ae.diff, patches/nicdrv-13-sige.diff: Update GLDv3 support

--- tu-2.6.0b/adddrv.sh.orig	2008-02-09 23:48:41.696455870 +0530
+++ tu-2.6.0b/adddrv.sh	2008-02-09 23:49:02.053319040 +0530
@@ -35,27 +35,5 @@
 set DEVLIST = ($DEVLIST '"pci10b9,5261"')	# ULi integrated nic
 set DEVLIST = ($DEVLIST '"pci10b9,5263"')	# ULi integrated nic
 
-#echo $DEVLIST
-
-set DEVLIST2 = ( )
-foreach i ($DEVLIST)
-	set pcidev = `grep $i /etc/driver_aliases`
-	echo $pcidev
-	if ("$pcidev" == "") then
-		set DEVLIST2 = ( $DEVLIST2 "$i" )
-	endif
-end
-
-if ("$DEVLIST2" == "") then
-        echo nothing to do.
-        exit 1
-endif
-
-set existing = `grep "^tu " /etc/driver_aliases`
-echo $existing
-if ("$existing" == "") then
-	/usr/sbin/add_drv -n -v -m '* 0600 root sys' -i "$DEVLIST2" tu
-else
-	/usr/sbin/update_drv -a -v -m '* 0600 root sys' -i "$DEVLIST2" tu
-endif
+/usr/sbin/add_drv -n -v -m '* 0600 root sys' -i "$DEVLIST" tu
 sync
--- tu-2.6.0b/tu_gem.c.orig	2007-09-25 07:07:00.000000000 -0400
+++ tu-2.6.0b/tu_gem.c	2009-02-19 23:10:01.232578853 -0500
@@ -4918,6 +4918,9 @@
  * OS depend (loadable streams driver) routine
  */
 /* ======================================================== */
+#ifdef GEM_CONFIG_GLDv3
+GEM_STREAM_OPS(tu_ops, tuattach, tudetach);
+#else
 static	struct module_info tuminfo = {
 	0,			/* mi_idnum */
 	"tu",			/* mi_idname */
@@ -4985,7 +4988,7 @@
 	NULL,		/* devo_bus_ops */
 	gem_power	/* devo_power */
 };
-
+#endif /* GEM_CONFIG_GLDv3 */
 static struct modldrv modldrv = {
 	&mod_driverops,	/* Type of module.  This one is a driver */
 	ident,