patch-2.4.17 linux/drivers/usb/CDCEther.c
Next file: linux/drivers/usb/Makefile
Previous file: linux/drivers/sound/ymfpci.c
Back to the patch index
Back to the overall index
- Lines: 56
- Date:
Fri Dec 21 16:40:32 2001
- Orig file:
linux-2.4.16/drivers/usb/CDCEther.c
- Orig date:
Fri Oct 5 19:06:08 2001
diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/drivers/usb/CDCEther.c linux/drivers/usb/CDCEther.c
@@ -337,13 +337,9 @@
ether_dev_t *ether_dev = (ether_dev_t *)net->priv;
int res;
- // We are finally getting used!
- MOD_INC_USE_COUNT;
-
// Turn on the USB and let the packets flow!!!
if ( (res = enable_net_traffic( ether_dev )) ) {
err( __FUNCTION__ "can't enable_net_traffic() - %d", res );
- MOD_DEC_USE_COUNT;
return -EIO;
}
@@ -391,9 +387,6 @@
usb_unlink_urb( ðer_dev->tx_urb );
usb_unlink_urb( ðer_dev->intr_urb );
- // We are not being used now.
- MOD_DEC_USE_COUNT;
-
// That's it. I'm done.
return 0;
}
@@ -480,6 +473,7 @@
i++, mclist = mclist->next) {
memcpy(&mclist->dmi_addr, &buff[i * 6], 6);
}
+#if 0
usb_control_msg(ether_dev->usb,
usb_sndctrlpipe(ether_dev->usb, 0),
SET_ETHERNET_MULTICAST_FILTER, /* request */
@@ -489,11 +483,13 @@
buff,
(6* net->mc_count), /* size */
HZ); /* timeout */
+#endif
kfree(buff);
}
-
+
+#if 0
CDC_SetEthernetPacketFilter(ether_dev);
-
+#endif
// Tell the kernel to start giving frames to us again.
netif_wake_queue(net);
}
@@ -1210,6 +1206,7 @@
// Now that we have an ethernet device, let's set it up
// (And I don't mean "set [it] up the bomb".)
net->priv = ether_dev;
+ SET_MODULE_OWNER(net);
net->open = CDCEther_open;
net->stop = CDCEther_close;
net->watchdog_timeo = CDC_ETHER_TX_TIMEOUT;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)