2.1.31 shaper, SMB, multicast

Russell Coker (rjc@snoopy.virtual.net.au)
Thu, 3 Apr 1997 22:36:30 +1000 (EST)

Here's a quick patch I wrote for 2.1.31 to make it compile with SMB FS,
multicast-routing, and shaper as a module. I have booted with this kernel
and noticed no problems related to it. I have inserted the shaper module and
removed it without apparent problems. I have not actually done anything
with multicast or shaper though...

Russell Coker

diff -r -c linux-2.1.31/drivers/net/shaper.c linux-2.1.31.fixed/drivers/net/shaper.c
*** linux-2.1.31/drivers/net/shaper.c Thu Apr 3 17:32:05 1997
--- linux-2.1.31.fixed/drivers/net/shaper.c Thu Apr 3 20:25:43 1997
***************
*** 614,620 ****
if(err<0)
return err;
printk(SHAPER_BANNER);
! if (register_netdev(dev) != 0)
return -EIO;
printk("Traffic shaper initialised.\n");
return 0;
--- 614,620 ----
if(err<0)
return err;
printk(SHAPER_BANNER);
! if (register_netdev(&dev_shape) != 0)
return -EIO;
printk("Traffic shaper initialised.\n");
return 0;
diff -r -c linux-2.1.31/net/ipv4/ipmr.c linux-2.1.31.fixed/net/ipv4/ipmr.c
*** linux-2.1.31/net/ipv4/ipmr.c Thu Apr 3 17:32:19 1997
--- linux-2.1.31.fixed/net/ipv4/ipmr.c Thu Apr 3 20:15:47 1997
***************
*** 357,363 ****
/* If the report failed throw the cache entry
out - Brad Parker */
if(ipmr_cache_report(skb, vifi, 0)<0)
! impr_cache_delete(cache);
}
}
/*
--- 357,363 ----
/* If the report failed throw the cache entry
out - Brad Parker */
if(ipmr_cache_report(skb, vifi, 0)<0)
! ipmr_cache_delete(cache);
}
}
/*
diff -r -c linux-2.1.31/net/netsyms.c linux-2.1.31.fixed/net/netsyms.c
*** linux-2.1.31/net/netsyms.c Thu Apr 3 17:32:40 1997
--- linux-2.1.31.fixed/net/netsyms.c Thu Apr 3 20:00:11 1997
***************
*** 150,159 ****
EXPORT_SYMBOL(scm_detach_fds);
#endif

- #ifdef CONFIG_SMB_FS_MODULE
- EXPORT_SYMBOL(scm_detach_fds);
- #endif
-
#ifdef CONFIG_INET
/* Internet layer registration */
EXPORT_SYMBOL(inet_add_protocol);
--- 150,155 ----