On Wed, Jul 25, 2001 at 11:14:52PM +1000, James Morris wrote: > diff -urN --exclude SCCS --exclude BitKeeper --exclude ChangeSet lsm/net/core/dev.c lsm-w1/net/core/dev.c > --- lsm/net/core/dev.c Wed Jul 25 11:35:03 2001 > +++ lsm-w1/net/core/dev.c Wed Jul 25 23:04:01 2001 > @@ -100,6 +100,7 @@ > #include <linux/init.h> > #include <linux/kmod.h> > #include <linux/module.h> > +#include <linux/security.h> > #if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO) > #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ > #endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ > @@ -2395,9 +2396,7 @@ > int register_netdevice(struct net_device *dev) > { > struct net_device *d, **dp; > -#ifdef CONFIG_NET_DIVERT > int ret; > -#endif > > spin_lock_init(&dev->queue_lock); > spin_lock_init(&dev->xmit_lock); > @@ -2564,6 +2563,8 @@ > #ifdef CONFIG_NET_DIVERT > free_divert_blk(dev); > #endif > + > + security_ops->netdev_ops->unregister(dev); > > if (dev->features & NETIF_F_DYNALLOC) { > #ifdef NET_REFCNT_DEBUG Did you mean to remove the #ifdef CONFIG_NET_DIVERT bit? _______________________________________________ linux-security-module mailing list linux-security-moduleat_private http://mail.wirex.com/mailman/listinfo/linux-security-module
This archive was generated by hypermail 2b30 : Wed Jul 25 2001 - 11:26:26 PDT