patch-2.4.19 linux-2.4.19/net/8021q/vlan.c
Next file: linux-2.4.19/net/8021q/vlan.h
Previous file: linux-2.4.19/net/802/tr.c
Back to the patch index
Back to the overall index
- Lines: 702
- Date:
Fri Aug 2 17:39:46 2002
- Orig file:
linux-2.4.18/net/8021q/vlan.c
- Orig date:
Fri Dec 21 09:42:05 2001
diff -urN linux-2.4.18/net/8021q/vlan.c linux-2.4.19/net/8021q/vlan.c
@@ -8,7 +8,9 @@
*
* Fixes:
* Fix for packet capture - Nick Eggleston <nick@dccinc.com>;
- *
+ * Add HW acceleration hooks - David S. Miller <davem@redhat.com>;
+ * Correct all the locking - David S. Miller <davem@redhat.com>;
+ * Use hash table for VLAN groups - David S. Miller <davem@redhat.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -37,12 +39,15 @@
/* Global VLAN variables */
/* Our listing of VLAN group(s) */
-struct vlan_group *p802_1Q_vlan_list;
+struct vlan_group *vlan_group_hash[VLAN_GRP_HASH_SIZE];
+spinlock_t vlan_group_lock = SPIN_LOCK_UNLOCKED;
+#define vlan_grp_hashfn(IDX) ((((IDX) >> VLAN_GRP_HASH_SHIFT) ^ (IDX)) & VLAN_GRP_HASH_MASK)
static char vlan_fullname[] = "802.1Q VLAN Support";
static unsigned int vlan_version = 1;
-static unsigned int vlan_release = 6;
-static char vlan_copyright[] = " Ben Greear <greearb@candelatech.com>";
+static unsigned int vlan_release = 7;
+static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";
+static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
static int vlan_device_event(struct notifier_block *, unsigned long, void *);
@@ -55,9 +60,6 @@
/* Determines interface naming scheme. */
unsigned short vlan_name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
-/* Counter for how many NON-VLAN protos we've received on a VLAN. */
-unsigned long vlan_bad_proto_recvd = 0;
-
/* DO reorder the header by default */
unsigned short vlan_default_dev_flags = 1;
@@ -83,6 +85,8 @@
printk(VLAN_INF "%s v%u.%u %s\n",
vlan_fullname, vlan_version, vlan_release, vlan_copyright);
+ printk(VLAN_INF "All bugs added by %s\n",
+ vlan_buggyright);
/* proc file system initialization */
err = vlan_proc_init();
@@ -100,71 +104,83 @@
vlan_ioctl_hook = vlan_ioctl_handler;
- printk(VLAN_INF "%s Initialization complete.\n", VLAN_NAME);
return 0;
}
/*
- * Cleanup of groups before exit
- */
-
-static void vlan_group_cleanup(void)
-{
- struct vlan_group *grp = NULL;
- struct vlan_group *nextgroup;
-
- for (grp = p802_1Q_vlan_list; (grp != NULL);) {
- nextgroup = grp->next;
- kfree(grp);
- grp = nextgroup;
- }
- p802_1Q_vlan_list = NULL;
-}
-
-/*
* Module 'remove' entry point.
* o delete /proc/net/router directory and static entries.
*/
static void __exit vlan_cleanup_module(void)
{
+ int i;
+
+ /* This table must be empty if there are no module
+ * references left.
+ */
+ for (i = 0; i < VLAN_GRP_HASH_SIZE; i++) {
+ if (vlan_group_hash[i] != NULL)
+ BUG();
+ }
+
/* Un-register us from receiving netdevice events */
unregister_netdevice_notifier(&vlan_notifier_block);
dev_remove_pack(&vlan_packet_type);
vlan_proc_cleanup();
- vlan_group_cleanup();
vlan_ioctl_hook = NULL;
}
module_init(vlan_proto_init);
module_exit(vlan_cleanup_module);
-/** Will search linearly for now, based on device index. Could
- * hash, or directly link, this some day. --Ben
- * TODO: Potential performance issue here. Linear search where N is
- * the number of 'real' devices used by VLANs.
- */
-struct vlan_group* vlan_find_group(int real_dev_ifindex)
+/* Must be invoked with vlan_group_lock held. */
+static struct vlan_group *__vlan_find_group(int real_dev_ifindex)
{
- struct vlan_group *grp = NULL;
+ struct vlan_group *grp;
- br_read_lock_bh(BR_NETPROTO_LOCK);
- for (grp = p802_1Q_vlan_list;
- ((grp != NULL) && (grp->real_dev_ifindex != real_dev_ifindex));
+ for (grp = vlan_group_hash[vlan_grp_hashfn(real_dev_ifindex)];
+ grp != NULL;
grp = grp->next) {
- /* nothing */ ;
+ if (grp->real_dev_ifindex == real_dev_ifindex)
+ break;
}
- br_read_unlock_bh(BR_NETPROTO_LOCK);
return grp;
}
-/* Find the protocol handler. Assumes VID < 0xFFF.
+/* Must hold vlan_group_lock. */
+static void __grp_hash(struct vlan_group *grp)
+{
+ struct vlan_group **head;
+
+ head = &vlan_group_hash[vlan_grp_hashfn(grp->real_dev_ifindex)];
+ grp->next = *head;
+ *head = grp;
+}
+
+/* Must hold vlan_group_lock. */
+static void __grp_unhash(struct vlan_group *grp)
+{
+ struct vlan_group *next, **pprev;
+
+ pprev = &vlan_group_hash[vlan_grp_hashfn(grp->real_dev_ifindex)];
+ next = *pprev;
+ while (next != grp) {
+ pprev = &next->next;
+ next = *pprev;
+ }
+ *pprev = grp->next;
+}
+
+/* Find the protocol handler. Assumes VID < VLAN_VID_MASK.
+ *
+ * Must be invoked with vlan_group_lock held.
*/
-struct net_device *find_802_1Q_vlan_dev(struct net_device *real_dev,
- unsigned short VID)
+struct net_device *__find_vlan_dev(struct net_device *real_dev,
+ unsigned short VID)
{
- struct vlan_group *grp = vlan_find_group(real_dev->ifindex);
+ struct vlan_group *grp = __vlan_find_group(real_dev->ifindex);
if (grp)
return grp->vlan_devices[VID];
@@ -172,109 +188,143 @@
return NULL;
}
-/** This method will explicitly do a dev_put on the device if do_dev_put
- * is TRUE. This gets around a difficulty with reference counting, and
- * the unregister-by-name (below). If do_locks is true, it will grab
- * a lock before un-registering. If do_locks is false, it is assumed that
- * the lock has already been grabbed externally... --Ben
+/* This returns 0 if everything went fine.
+ * It will return 1 if the group was killed as a result.
+ * A negative return indicates failure.
+ *
+ * The RTNL lock must be held.
*/
-int unregister_802_1Q_vlan_dev(int real_dev_ifindex, unsigned short vlan_id,
- int do_dev_put, int do_locks)
+static int unregister_vlan_dev(struct net_device *real_dev,
+ unsigned short vlan_id)
{
struct net_device *dev = NULL;
+ int real_dev_ifindex = real_dev->ifindex;
struct vlan_group *grp;
+ int i, ret;
#ifdef VLAN_DEBUG
printk(VLAN_DBG __FUNCTION__ ": VID: %i\n", vlan_id);
#endif
/* sanity check */
- if ((vlan_id >= 0xFFF) || (vlan_id <= 0))
+ if ((vlan_id >= VLAN_VID_MASK) || (vlan_id <= 0))
return -EINVAL;
- grp = vlan_find_group(real_dev_ifindex);
+ spin_lock_bh(&vlan_group_lock);
+ grp = __vlan_find_group(real_dev_ifindex);
+ spin_unlock_bh(&vlan_group_lock);
+
+ ret = 0;
+
if (grp) {
dev = grp->vlan_devices[vlan_id];
if (dev) {
/* Remove proc entry */
vlan_proc_rem_dev(dev);
- /* Take it out of our own structures */
- grp->vlan_devices[vlan_id] = NULL;
+ /* Take it out of our own structures, but be sure to
+ * interlock with HW accelerating devices or SW vlan
+ * input packet processing.
+ */
+ if (real_dev->features &
+ (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) {
+ real_dev->vlan_rx_kill_vid(real_dev, vlan_id);
+ } else {
+ br_write_lock(BR_NETPROTO_LOCK);
+ grp->vlan_devices[vlan_id] = NULL;
+ br_write_unlock(BR_NETPROTO_LOCK);
+ }
- /* Take it out of the global list of devices.
- * NOTE: This deletes dev, don't access it again!!
+ /* Caller unregisters (and if necessary, puts)
+ * VLAN device, but we get rid of the reference to
+ * real_dev here.
*/
+ dev_put(real_dev);
- if (do_dev_put)
- dev_put(dev);
+ /* If the group is now empty, kill off the
+ * group.
+ */
+ for (i = 0; i < VLAN_VID_MASK; i++)
+ if (grp->vlan_devices[i])
+ break;
+
+ if (i == VLAN_VID_MASK) {
+ if (real_dev->features & NETIF_F_HW_VLAN_RX)
+ real_dev->vlan_rx_register(real_dev, NULL);
+
+ spin_lock_bh(&vlan_group_lock);
+ __grp_unhash(grp);
+ spin_unlock_bh(&vlan_group_lock);
- /* TODO: Please review this code. */
- if (do_locks) {
- rtnl_lock();
- unregister_netdevice(dev);
- rtnl_unlock();
- } else {
- unregister_netdevice(dev);
+ ret = 1;
}
MOD_DEC_USE_COUNT;
}
}
-
- return 0;
+
+ return ret;
}
-int unregister_802_1Q_vlan_device(const char *vlan_IF_name)
+static int unregister_vlan_device(const char *vlan_IF_name)
{
struct net_device *dev = NULL;
+ int ret;
-#ifdef VLAN_DEBUG
- printk(VLAN_DBG __FUNCTION__ ": unregister VLAN by name, name -:%s:-\n",
- vlan_IF_name);
-#endif
dev = dev_get_by_name(vlan_IF_name);
+ ret = -EINVAL;
if (dev) {
if (dev->priv_flags & IFF_802_1Q_VLAN) {
- return unregister_802_1Q_vlan_dev(
- VLAN_DEV_INFO(dev)->real_dev->ifindex,
- (unsigned short)(VLAN_DEV_INFO(dev)->vlan_id),
- 1 /* do dev_put */, 1 /* do locking */);
+ rtnl_lock();
+
+ ret = unregister_vlan_dev(VLAN_DEV_INFO(dev)->real_dev,
+ VLAN_DEV_INFO(dev)->vlan_id);
+
+ dev_put(dev);
+ unregister_netdevice(dev);
+
+ rtnl_unlock();
+
+ if (ret == 1)
+ ret = 0;
} else {
printk(VLAN_ERR __FUNCTION__
": ERROR: Tried to remove a non-vlan device "
"with VLAN code, name: %s priv_flags: %hX\n",
dev->name, dev->priv_flags);
dev_put(dev);
- return -EPERM;
+ ret = -EPERM;
}
} else {
#ifdef VLAN_DEBUG
printk(VLAN_DBG __FUNCTION__ ": WARNING: Could not find dev.\n");
#endif
- return -EINVAL;
+ ret = -EINVAL;
}
+
+ return ret;
}
/* Attach a VLAN device to a mac address (ie Ethernet Card).
* Returns the device that was created, or NULL if there was
* an error of some kind.
*/
-struct net_device *register_802_1Q_vlan_device(const char* eth_IF_name,
+static struct net_device *register_vlan_device(const char *eth_IF_name,
unsigned short VLAN_ID)
{
struct vlan_group *grp;
struct net_device *new_dev;
struct net_device *real_dev; /* the ethernet device */
int malloc_size = 0;
+ int r;
#ifdef VLAN_DEBUG
printk(VLAN_DBG __FUNCTION__ ": if_name -:%s:- vid: %i\n",
eth_IF_name, VLAN_ID);
#endif
- if (VLAN_ID >= 0xfff)
+ if (VLAN_ID >= VLAN_VID_MASK)
goto out_ret_null;
/* find the device relating to eth_IF_name. */
@@ -282,14 +332,47 @@
if (!real_dev)
goto out_ret_null;
- /* TODO: Make sure this device can really handle having a VLAN attached
- * to it...
+ if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
+ printk(VLAN_DBG __FUNCTION__ ": VLANs not supported on %s.\n",
+ real_dev->name);
+ goto out_put_dev;
+ }
+
+ if ((real_dev->features & NETIF_F_HW_VLAN_RX) &&
+ (real_dev->vlan_rx_register == NULL ||
+ real_dev->vlan_rx_kill_vid == NULL)) {
+ printk(VLAN_DBG __FUNCTION__ ": Device %s has buggy VLAN hw accel.\n",
+ real_dev->name);
+ goto out_put_dev;
+ }
+
+ if ((real_dev->features & NETIF_F_HW_VLAN_FILTER) &&
+ (real_dev->vlan_rx_add_vid == NULL ||
+ real_dev->vlan_rx_kill_vid == NULL)) {
+ printk(VLAN_DBG __FUNCTION__ ": Device %s has buggy VLAN hw accel.\n",
+ real_dev->name);
+ goto out_put_dev;
+ }
+
+ /* From this point on, all the data structures must remain
+ * consistent.
+ */
+ rtnl_lock();
+
+ /* The real device must be up and operating in order to
+ * assosciate a VLAN device with it.
*/
- if (find_802_1Q_vlan_dev(real_dev, VLAN_ID)) {
+ if (!(real_dev->flags & IFF_UP))
+ goto out_unlock;
+
+ spin_lock_bh(&vlan_group_lock);
+ r = (__find_vlan_dev(real_dev, VLAN_ID) != NULL);
+ spin_unlock_bh(&vlan_group_lock);
+
+ if (r) {
/* was already registered. */
printk(VLAN_DBG __FUNCTION__ ": ALREADY had VLAN registered\n");
- dev_put(real_dev);
- return NULL;
+ goto out_unlock;
}
malloc_size = (sizeof(struct net_device));
@@ -298,15 +381,14 @@
new_dev, malloc_size);
if (new_dev == NULL)
- goto out_put_dev;
+ goto out_unlock;
memset(new_dev, 0, malloc_size);
- /* set us up to not use a Qdisc, as the underlying Hardware device
+ /* Set us up to have no queue, as the underlying Hardware device
* can do all the queueing we could want.
*/
- /* new_dev->qdisc_sleeping = &noqueue_qdisc; Not needed it seems. */
- new_dev->tx_queue_len = 0; /* This should effectively give us no queue. */
+ new_dev->tx_queue_len = 0;
/* Gotta set up the fields for the device. */
#ifdef VLAN_DEBUG
@@ -368,8 +450,11 @@
/* TODO: maybe just assign it to be ETHERNET? */
new_dev->type = real_dev->type;
- /* Regular ethernet + 4 bytes (18 total). */
- new_dev->hard_header_len = VLAN_HLEN + real_dev->hard_header_len;
+ new_dev->hard_header_len = real_dev->hard_header_len;
+ if (!(real_dev->features & NETIF_F_HW_VLAN_TX)) {
+ /* Regular ethernet + 4 bytes (18 total). */
+ new_dev->hard_header_len += VLAN_HLEN;
+ }
new_dev->priv = kmalloc(sizeof(struct vlan_dev_info),
GFP_KERNEL);
@@ -377,10 +462,8 @@
new_dev->priv,
sizeof(struct vlan_dev_info));
- if (new_dev->priv == NULL) {
- kfree(new_dev);
- goto out_put_dev;
- }
+ if (new_dev->priv == NULL)
+ goto out_free_newdev;
memset(new_dev->priv, 0, sizeof(struct vlan_dev_info));
@@ -390,15 +473,21 @@
new_dev->open = vlan_dev_open;
new_dev->stop = vlan_dev_stop;
- new_dev->hard_header = vlan_dev_hard_header;
- new_dev->hard_start_xmit = vlan_dev_hard_start_xmit;
- new_dev->rebuild_header = vlan_dev_rebuild_header;
+ if (real_dev->features & NETIF_F_HW_VLAN_TX) {
+ new_dev->hard_header = real_dev->hard_header;
+ new_dev->hard_start_xmit = vlan_dev_hwaccel_hard_start_xmit;
+ new_dev->rebuild_header = real_dev->rebuild_header;
+ } else {
+ new_dev->hard_header = vlan_dev_hard_header;
+ new_dev->hard_start_xmit = vlan_dev_hard_start_xmit;
+ new_dev->rebuild_header = vlan_dev_rebuild_header;
+ }
new_dev->hard_header_parse = real_dev->hard_header_parse;
new_dev->set_mac_address = vlan_dev_set_mac_address;
new_dev->set_multicast_list = vlan_dev_set_multicast_list;
- VLAN_DEV_INFO(new_dev)->vlan_id = VLAN_ID; /* 1 through 0xFFF */
+ VLAN_DEV_INFO(new_dev)->vlan_id = VLAN_ID; /* 1 through VLAN_VID_MASK */
VLAN_DEV_INFO(new_dev)->real_dev = real_dev;
VLAN_DEV_INFO(new_dev)->dent = NULL;
VLAN_DEV_INFO(new_dev)->flags = vlan_default_dev_flags;
@@ -411,37 +500,39 @@
/* So, got the sucker initialized, now lets place
* it into our local structure.
*/
- grp = vlan_find_group(real_dev->ifindex);
+ spin_lock_bh(&vlan_group_lock);
+ grp = __vlan_find_group(real_dev->ifindex);
+ spin_unlock_bh(&vlan_group_lock);
+
+ /* Note, we are running under the RTNL semaphore
+ * so it cannot "appear" on us.
+ */
if (!grp) { /* need to add a new group */
grp = kmalloc(sizeof(struct vlan_group), GFP_KERNEL);
- VLAN_MEM_DBG("grp malloc, addr: %p size: %i\n",
- grp, sizeof(struct vlan_group));
- if (!grp) {
- kfree(new_dev->priv);
- VLAN_FMEM_DBG("new_dev->priv free, addr: %p\n",
- new_dev->priv);
- kfree(new_dev);
- VLAN_FMEM_DBG("new_dev free, addr: %p\n", new_dev);
-
- goto out_put_dev;
- }
+ if (!grp)
+ goto out_free_newdev_priv;
- printk(KERN_ALERT "VLAN REGISTER: Allocated new group.\n");
+ /* printk(KERN_ALERT "VLAN REGISTER: Allocated new group.\n"); */
memset(grp, 0, sizeof(struct vlan_group));
grp->real_dev_ifindex = real_dev->ifindex;
- br_write_lock_bh(BR_NETPROTO_LOCK);
- grp->next = p802_1Q_vlan_list;
- p802_1Q_vlan_list = grp;
- br_write_unlock_bh(BR_NETPROTO_LOCK);
+ spin_lock_bh(&vlan_group_lock);
+ __grp_hash(grp);
+ spin_unlock_bh(&vlan_group_lock);
+
+ if (real_dev->features & NETIF_F_HW_VLAN_RX)
+ real_dev->vlan_rx_register(real_dev, grp);
}
grp->vlan_devices[VLAN_ID] = new_dev;
+
vlan_proc_add_dev(new_dev); /* create it's proc entry */
- /* TODO: Please check this: RTNL --Ben */
- rtnl_lock();
+ if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
+ real_dev->vlan_rx_add_vid(real_dev, VLAN_ID);
+
register_netdevice(new_dev);
+
rtnl_unlock();
/* NOTE: We have a reference to the real device,
@@ -453,6 +544,15 @@
#endif
return new_dev;
+out_free_newdev_priv:
+ kfree(new_dev->priv);
+
+out_free_newdev:
+ kfree(new_dev);
+
+out_unlock:
+ rtnl_unlock();
+
out_put_dev:
dev_put(real_dev);
@@ -464,78 +564,78 @@
{
struct net_device *dev = (struct net_device *)(ptr);
struct vlan_group *grp = NULL;
- int i = 0;
+ int i, flgs;
struct net_device *vlandev = NULL;
+ spin_lock_bh(&vlan_group_lock);
+ grp = __vlan_find_group(dev->ifindex);
+ spin_unlock_bh(&vlan_group_lock);
+
+ if (!grp)
+ goto out;
+
+ /* It is OK that we do not hold the group lock right now,
+ * as we run under the RTNL lock.
+ */
+
switch (event) {
case NETDEV_CHANGEADDR:
- /* Ignore for now */
- break;
-
case NETDEV_GOING_DOWN:
/* Ignore for now */
break;
case NETDEV_DOWN:
- /* TODO: Please review this code. */
- /* put all related VLANs in the down state too. */
- for (grp = p802_1Q_vlan_list; grp != NULL; grp = grp->next) {
- int flgs = 0;
-
- for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
- vlandev = grp->vlan_devices[i];
- if (!vlandev ||
- (VLAN_DEV_INFO(vlandev)->real_dev != dev) ||
- (!(vlandev->flags & IFF_UP)))
- continue;
-
- flgs = vlandev->flags;
- flgs &= ~IFF_UP;
- dev_change_flags(vlandev, flgs);
- }
+ /* Put all VLANs for this dev in the down state too. */
+ for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+ vlandev = grp->vlan_devices[i];
+ if (!vlandev)
+ continue;
+
+ flgs = vlandev->flags;
+ if (!(flgs & IFF_UP))
+ continue;
+
+ dev_change_flags(vlandev, flgs & ~IFF_UP);
}
break;
case NETDEV_UP:
- /* TODO: Please review this code. */
- /* put all related VLANs in the down state too. */
- for (grp = p802_1Q_vlan_list; grp != NULL; grp = grp->next) {
- int flgs;
-
- for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
- vlandev = grp->vlan_devices[i];
- if (!vlandev ||
- (VLAN_DEV_INFO(vlandev)->real_dev != dev) ||
- (vlandev->flags & IFF_UP))
- continue;
+ /* Put all VLANs for this dev in the up state too. */
+ for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+ vlandev = grp->vlan_devices[i];
+ if (!vlandev)
+ continue;
- flgs = vlandev->flags;
- flgs |= IFF_UP;
- dev_change_flags(vlandev, flgs);
- }
+ flgs = vlandev->flags;
+ if (flgs & IFF_UP)
+ continue;
+
+ dev_change_flags(vlandev, flgs | IFF_UP);
}
break;
case NETDEV_UNREGISTER:
- /* TODO: Please review this code. */
- /* delete all related VLANs. */
- for (grp = p802_1Q_vlan_list; grp != NULL; grp = grp->next) {
- for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
- vlandev = grp->vlan_devices[i];
- if (!vlandev ||
- (VLAN_DEV_INFO(vlandev)->real_dev != dev))
- continue;
-
- unregister_802_1Q_vlan_dev(
- VLAN_DEV_INFO(vlandev)->real_dev->ifindex,
- VLAN_DEV_INFO(vlandev)->vlan_id,
- 0, 0);
- vlandev = NULL;
- }
+ /* Delete all VLANs for this dev. */
+ for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+ int ret;
+
+ vlandev = grp->vlan_devices[i];
+ if (!vlandev)
+ continue;
+
+ ret = unregister_vlan_dev(dev,
+ VLAN_DEV_INFO(vlandev)->vlan_id);
+
+ unregister_netdev(vlandev);
+
+ /* Group was destroyed? */
+ if (ret == 1)
+ break;
}
break;
};
+out:
return NOTIFY_DONE;
}
@@ -612,7 +712,7 @@
* talk to: args.dev1 We also have the
* VLAN ID: args.u.VID
*/
- if (register_802_1Q_vlan_device(args.device1, args.u.VID)) {
+ if (register_vlan_device(args.device1, args.u.VID)) {
err = 0;
} else {
err = -EINVAL;
@@ -623,7 +723,7 @@
/* Here, the args.dev1 is the actual VLAN we want
* to get rid of.
*/
- err = unregister_802_1Q_vlan_device(args.device1);
+ err = unregister_vlan_device(args.device1);
break;
default:
@@ -636,4 +736,4 @@
return err;
}
-
+MODULE_LICENSE("GPL");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)