2.3.27 tr_freedev patches

Keith Owens (kaos@ocs.com.au)
Fri, 12 Nov 1999 20:56:55 +1100

tr_freedev() was removed from 2.3.27 but references to it still exist.
Assuming it was meant to be removed, apply this patch.

Index: 27.1/net/netsyms.c
--- 27.1/net/netsyms.c Sat, 04 Sep 1999 13:10:55 +1000 keith (linux-2.3/a/b/34_netsyms.c 1.8 644)
+++ 27.1(w)/net/netsyms.c Fri, 12 Nov 1999 20:06:27 +1100 keith (linux-2.3/a/b/34_netsyms.c 1.8 644)
@@ -444,7 +444,6 @@
EXPORT_SYMBOL(register_trdev);
EXPORT_SYMBOL(unregister_trdev);
EXPORT_SYMBOL(init_trdev);
-EXPORT_SYMBOL(tr_freedev);
#endif

/* Device callback registration */
Index: 27.1/include/linux/netdevice.h
--- 27.1/include/linux/netdevice.h Sat, 04 Sep 1999 13:00:11 +1000 keith (linux-2.3/C/b/34_netdevice. 1.6 644)
+++ 27.1(w)/include/linux/netdevice.h Fri, 12 Nov 1999 20:06:32 +1100 keith (linux-2.3/C/b/34_netdevice. 1.6 644)
@@ -423,7 +423,6 @@
extern void fddi_setup(struct net_device *dev);
extern void tr_setup(struct net_device *dev);
extern void fc_setup(struct net_device *dev);
-extern void tr_freedev(struct net_device *dev);
extern void fc_freedev(struct net_device *dev);
extern int ether_config(struct net_device *dev, struct ifmap *map);
/* Support for loadable net-drivers */
Index: 27.1/drivers/net/tokenring/ibmtr.c
--- 27.1/drivers/net/tokenring/ibmtr.c Tue, 12 Oct 1999 22:00:51 +1000 keith (linux-2.3/h/c/30_ibmtr.c 1.1 644)
+++ 27.1(w)/drivers/net/tokenring/ibmtr.c Fri, 12 Nov 1999 20:06:02 +1100 keith (linux-2.3/h/c/30_ibmtr.c 1.1 644)
@@ -267,14 +267,8 @@
*/

if (ibmtr_probe1(dev, base_addr))
- {
-#ifndef MODULE
-#ifndef PCMCIA
- tr_freedev(dev);
-#endif
-#endif
return -ENODEV;
- } else
+ else
return 0;
}
else if (base_addr != 0) /* Don't probe at all. */
@@ -285,13 +279,7 @@
int ioaddr = ibmtr_portlist[i];
if (check_region(ioaddr, IBMTR_IO_EXTENT))
continue;
- if (ibmtr_probe1(dev, ioaddr)) {
-#ifndef MODULE
-#ifndef PCMCIA
- tr_freedev(dev);
-#endif
-#endif
- } else
+ if (!ibmtr_probe1(dev, ioaddr))
return 0;
}

Index: 27.1/drivers/net/tokenring/tms380tr.c
--- 27.1/drivers/net/tokenring/tms380tr.c Sun, 07 Nov 1999 17:24:01 +1100 keith (linux-2.3/i/c/18_tms380tr.c 1.2 644)
+++ 27.1(w)/drivers/net/tokenring/tms380tr.c Fri, 12 Nov 1999 20:06:19 +1100 keith (linux-2.3/i/c/18_tms380tr.c 1.2 644)
@@ -231,13 +231,7 @@
int ioaddr = tms380tr_portlist[i];
if(check_region(ioaddr, TMS380TR_IO_EXTENT))
continue;
- if(tms380tr_probe1(dev, ioaddr))
- {
-#ifndef MODULE
- tr_freedev(dev);
-#endif
- }
- else
+ if(!tms380tr_probe1(dev, ioaddr))
return (0);
}

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