#include <linux/ethtool.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
+#include <linux/wait.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
#include <asm/byteorder.h>
{ USB_DEVICE(0x1342, 0x0204) }, /* Mobility USB-Ethernet Adapter */
{ USB_DEVICE(0x13d2, 0x0400) }, /* Shark Pocket Adapter */
{ USB_DEVICE(0x1485, 0x0001) }, /* Silicom U2E */
+ { USB_DEVICE(0x1485, 0x0002) }, /* Psion Dacom Gold Port Ethernet */
{ USB_DEVICE(0x1645, 0x0005) }, /* Entrega E45 */
{ USB_DEVICE(0x1645, 0x0008) }, /* Entrega USB Ethernet Adapter */
{ USB_DEVICE(0x1645, 0x8005) }, /* PortGear Ethernet Adapter */
* kaweth_driver
****************************************************************/
static struct usb_driver kaweth_driver = {
- .owner = THIS_MODULE,
.name = driver_name,
.probe = kaweth_probe,
.disconnect = kaweth_disconnect,
__u32 status;
int end;
- int removed;
int suspend_lowmem_rx;
int suspend_lowmem_ctrl;
int linkstate;
struct kaweth_ethernet_configuration configuration;
struct net_device_stats stats;
-} __attribute__ ((packed));
+};
/****************************************************************
0,
KAWETH_CONTROL_TIMEOUT);
- udelay(10000);
+ mdelay(10);
kaweth_dbg("kaweth_reset() returns %d.",result);
}
static void kaweth_usb_receive(struct urb *, struct pt_regs *regs);
-static int kaweth_resubmit_rx_urb(struct kaweth_device *, int);
+static int kaweth_resubmit_rx_urb(struct kaweth_device *, gfp_t);
/****************************************************************
int_callback
*****************************************************************/
-static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, int mf)
+static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
{
int status;
/* we check the link state to report changes */
if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) {
- if (!act_state)
+ if (act_state)
netif_carrier_on(kaweth->net);
else
netif_carrier_off(kaweth->net);
* kaweth_resubmit_rx_urb
****************************************************************/
static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
- int mem_flags)
+ gfp_t mem_flags)
{
int result;
struct sk_buff *skb;
- if(unlikely(urb->status == -ECONNRESET || urb->status == -ECONNABORTED || urb->status == -ESHUTDOWN))
+ if(unlikely(urb->status == -ECONNRESET || urb->status == -ESHUTDOWN))
/* we are killed - set a flag and wake the disconnect handler */
{
kaweth->end = 1;
****************************************************************/
static int kaweth_open(struct net_device *net)
{
- struct kaweth_device *kaweth = (struct kaweth_device *)net->priv;
+ struct kaweth_device *kaweth = netdev_priv(net);
int res;
kaweth_dbg("Opening network device.");
INTBUFFERSIZE,
int_callback,
kaweth,
- 8);
+ 250); /* overriding the descriptor */
kaweth->irq_urb->transfer_dma = kaweth->intbufferhandle;
kaweth->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
res = usb_submit_urb(kaweth->irq_urb, GFP_KERNEL);
if (res) {
- usb_unlink_urb(kaweth->rx_urb);
+ usb_kill_urb(kaweth->rx_urb);
return -EIO;
}
****************************************************************/
static int kaweth_close(struct net_device *net)
{
- struct kaweth_device *kaweth = net->priv;
+ struct kaweth_device *kaweth = netdev_priv(net);
netif_stop_queue(net);
kaweth->status |= KAWETH_STATUS_CLOSING;
- usb_unlink_urb(kaweth->irq_urb);
- usb_unlink_urb(kaweth->rx_urb);
+ usb_kill_urb(kaweth->irq_urb);
+ usb_kill_urb(kaweth->rx_urb);
+ usb_kill_urb(kaweth->tx_urb);
flush_scheduled_work();
/* a scheduled work may have resubmitted,
we hit them again */
- usb_unlink_urb(kaweth->irq_urb);
- usb_unlink_urb(kaweth->rx_urb);
+ usb_kill_urb(kaweth->irq_urb);
+ usb_kill_urb(kaweth->rx_urb);
kaweth->status &= ~KAWETH_STATUS_CLOSING;
return 0;
}
-static int netdev_ethtool_ioctl(struct net_device *dev, void __user *useraddr)
+static void kaweth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{
- u32 ethcmd;
-
- if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd)))
- return -EFAULT;
-
- switch (ethcmd) {
- case ETHTOOL_GDRVINFO: {
- struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strlcpy(info.driver, driver_name, sizeof(info.driver));
- if (copy_to_user(useraddr, &info, sizeof(info)))
- return -EFAULT;
- return 0;
- }
- }
- return -EOPNOTSUPP;
+ strlcpy(info->driver, driver_name, sizeof(info->driver));
}
-/****************************************************************
- * kaweth_ioctl
- ****************************************************************/
-static int kaweth_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-{
- switch (cmd) {
- case SIOCETHTOOL:
- return netdev_ethtool_ioctl(net, rq->ifr_data);
- }
- return -EOPNOTSUPP;
-}
+static struct ethtool_ops ops = {
+ .get_drvinfo = kaweth_get_drvinfo
+};
/****************************************************************
* kaweth_usb_transmit_complete
struct sk_buff *skb = kaweth->tx_skb;
if (unlikely(urb->status != 0))
- kaweth_dbg("%s: TX status %d.", kaweth->net->name, urb->status);
+ if (urb->status != -ENOENT)
+ kaweth_dbg("%s: TX status %d.", kaweth->net->name, urb->status);
netif_wake_queue(kaweth->net);
dev_kfree_skb_irq(skb);
****************************************************************/
static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
{
- struct kaweth_device *kaweth = net->priv;
+ struct kaweth_device *kaweth = netdev_priv(net);
__le16 *private_header;
int res;
spin_lock(&kaweth->device_lock);
- if (kaweth->removed) {
- /* our device is undergoing disconnection - we bail out */
- spin_unlock(&kaweth->device_lock);
- dev_kfree_skb_irq(skb);
- return 0;
- }
-
kaweth_async_set_rx_mode(kaweth);
netif_stop_queue(net);
kaweth_usb_transmit_complete,
kaweth);
kaweth->end = 0;
- kaweth->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
{
****************************************************************/
static void kaweth_set_rx_mode(struct net_device *net)
{
- struct kaweth_device *kaweth = net->priv;
+ struct kaweth_device *kaweth = netdev_priv(net);
__u16 packet_filter_bitmap = KAWETH_PACKET_FILTER_DIRECTED |
KAWETH_PACKET_FILTER_BROADCAST |
****************************************************************/
static struct net_device_stats *kaweth_netdev_stats(struct net_device *dev)
{
- return &((struct kaweth_device *)dev->priv)->stats;
+ struct kaweth_device *kaweth = netdev_priv(dev);
+ return &kaweth->stats;
}
/****************************************************************
****************************************************************/
static void kaweth_tx_timeout(struct net_device *net)
{
- struct kaweth_device *kaweth = net->priv;
+ struct kaweth_device *kaweth = netdev_priv(net);
kaweth_warn("%s: Tx timed out. Resetting.", net->name);
kaweth->stats.tx_errors++;
kaweth_dbg("Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x",
dev->devnum,
- (int)dev->descriptor.idVendor,
- (int)dev->descriptor.idProduct,
- (int)dev->descriptor.bcdDevice);
+ le16_to_cpu(dev->descriptor.idVendor),
+ le16_to_cpu(dev->descriptor.idProduct),
+ le16_to_cpu(dev->descriptor.bcdDevice));
kaweth_dbg("Device at %p", dev);
(int)dev->descriptor.bLength,
(int)dev->descriptor.bDescriptorType);
- if(!(kaweth = kmalloc(sizeof(struct kaweth_device), GFP_KERNEL)))
+ netdev = alloc_etherdev(sizeof(*kaweth));
+ if (!netdev)
return -ENOMEM;
- memset(kaweth, 0, sizeof(struct kaweth_device));
-
+ kaweth = netdev_priv(netdev);
kaweth->dev = dev;
+ kaweth->net = netdev;
+
spin_lock_init(&kaweth->device_lock);
init_waitqueue_head(&kaweth->term_wait);
* downloaded. Don't try to do it again, or we'll hang the device.
*/
- if (dev->descriptor.bcdDevice >> 8) {
+ if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
kaweth_info("Firmware present in device.");
} else {
/* Download the firmware */
100,
2)) < 0) {
kaweth_err("Error downloading firmware (%d)", result);
- free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
- return -EIO;
+ goto err_fw;
}
if ((result = kaweth_download_firmware(kaweth,
100,
3)) < 0) {
kaweth_err("Error downloading firmware fix (%d)", result);
- free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
- return -EIO;
+ goto err_fw;
}
if ((result = kaweth_download_firmware(kaweth,
126,
2)) < 0) {
kaweth_err("Error downloading trigger code (%d)", result);
- free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
- return -EIO;
+ goto err_fw;
+
}
if ((result = kaweth_download_firmware(kaweth,
126,
3)) < 0) {
kaweth_err("Error downloading trigger code fix (%d)", result);
- free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
- return -EIO;
+ goto err_fw;
}
if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
kaweth_err("Error triggering firmware (%d)", result);
- free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
- return -EIO;
+ goto err_fw;
}
/* Device will now disappear for a moment... */
kaweth_info("Firmware loaded. I'll be back...");
+err_fw:
free_page((unsigned long)kaweth->firmware_buf);
- kfree(kaweth);
+ free_netdev(netdev);
return -EIO;
}
if(result < 0) {
kaweth_err("Error reading configuration (%d), no net device created", result);
- kfree(kaweth);
- return -EIO;
+ goto err_free_netdev;
}
kaweth_info("Statistics collection: %x", kaweth->configuration.statistics_mask);
&bcast_addr,
sizeof(bcast_addr))) {
kaweth_err("Firmware not functioning properly, no net device created");
- kfree(kaweth);
- return -EIO;
+ goto err_free_netdev;
}
if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) {
kaweth_dbg("Error setting URB size");
- goto err_no_netdev;
+ goto err_free_netdev;
}
if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
kaweth_err("Error setting SOFS wait");
- goto err_no_netdev;
+ goto err_free_netdev;
}
result = kaweth_set_receive_filter(kaweth,
if(result < 0) {
kaweth_err("Error setting receive filter");
- kfree(kaweth);
- return -EIO;
+ goto err_free_netdev;
}
kaweth_dbg("Initializing net device.");
- if (!(netdev = alloc_etherdev(0))) {
- kfree(kaweth);
- return -ENOMEM;
- }
-
kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!kaweth->tx_urb)
- goto err_no_urb;
+ goto err_free_netdev;
kaweth->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!kaweth->rx_urb)
goto err_only_tx;
if (!kaweth->rx_buf)
goto err_all_but_rxbuf;
- kaweth->net = netdev;
- memcpy(kaweth->net->broadcast, &bcast_addr, sizeof(bcast_addr));
- memcpy(kaweth->net->dev_addr,
- &kaweth->configuration.hw_addr,
+ memcpy(netdev->broadcast, &bcast_addr, sizeof(bcast_addr));
+ memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr,
sizeof(kaweth->configuration.hw_addr));
- kaweth->net->priv = kaweth;
- kaweth->net->open = kaweth_open;
- kaweth->net->stop = kaweth_close;
+ netdev->open = kaweth_open;
+ netdev->stop = kaweth_close;
- kaweth->net->watchdog_timeo = KAWETH_TX_TIMEOUT;
- kaweth->net->tx_timeout = kaweth_tx_timeout;
+ netdev->watchdog_timeo = KAWETH_TX_TIMEOUT;
+ netdev->tx_timeout = kaweth_tx_timeout;
- kaweth->net->do_ioctl = kaweth_ioctl;
- kaweth->net->hard_start_xmit = kaweth_start_xmit;
- kaweth->net->set_multicast_list = kaweth_set_rx_mode;
- kaweth->net->get_stats = kaweth_netdev_stats;
- kaweth->net->mtu = le16_to_cpu(kaweth->configuration.segment_size);
+ netdev->hard_start_xmit = kaweth_start_xmit;
+ netdev->set_multicast_list = kaweth_set_rx_mode;
+ netdev->get_stats = kaweth_netdev_stats;
+ netdev->mtu = le16_to_cpu(kaweth->configuration.segment_size);
+ SET_ETHTOOL_OPS(netdev, &ops);
- memset(&kaweth->stats, 0, sizeof(kaweth->stats));
+ /* kaweth is zeroed as part of alloc_netdev */
INIT_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl, (void *)kaweth);
usb_free_urb(kaweth->rx_urb);
err_only_tx:
usb_free_urb(kaweth->tx_urb);
-err_no_urb:
+err_free_netdev:
free_netdev(netdev);
-err_no_netdev:
- kfree(kaweth);
+
return -EIO;
}
static void kaweth_disconnect(struct usb_interface *intf)
{
struct kaweth_device *kaweth = usb_get_intfdata(intf);
+ struct net_device *netdev;
kaweth_info("Unregistering");
kaweth_warn("unregistering non-existant device");
return;
}
+ netdev = kaweth->net;
- kaweth->removed = 1;
- usb_unlink_urb(kaweth->irq_urb);
- usb_unlink_urb(kaweth->rx_urb);
-
- /* we need to wait for the urb to be cancelled, if it is active */
- spin_lock(&kaweth->device_lock);
- if (usb_unlink_urb(kaweth->tx_urb) == -EINPROGRESS) {
- spin_unlock(&kaweth->device_lock);
- wait_event(kaweth->term_wait, kaweth->end);
- } else {
- spin_unlock(&kaweth->device_lock);
- }
-
- if(kaweth->net) {
- if(kaweth->net->flags & IFF_UP) {
- kaweth_dbg("Closing net device");
- dev_close(kaweth->net);
- }
-
- kaweth_dbg("Unregistering net device");
- unregister_netdev(kaweth->net);
- free_netdev(kaweth->net);
- }
+ kaweth_dbg("Unregistering net device");
+ unregister_netdev(netdev);
usb_free_urb(kaweth->rx_urb);
usb_free_urb(kaweth->tx_urb);
usb_free_urb(kaweth->irq_urb);
-
usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
- kfree(kaweth);
+ free_netdev(netdev);
}
// Starts urb and waits for completion or timeout
static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
{
- DECLARE_WAITQUEUE(wait, current);
struct usb_api_data awd;
int status;
init_waitqueue_head(&awd.wqh);
awd.done = 0;
- add_wait_queue(&awd.wqh, &wait);
urb->context = &awd;
status = usb_submit_urb(urb, GFP_NOIO);
if (status) {
// something went wrong
usb_free_urb(urb);
- remove_wait_queue(&awd.wqh, &wait);
return status;
}
- set_current_state(TASK_UNINTERRUPTIBLE);
- while (timeout && !awd.done) {
- timeout = schedule_timeout(timeout);
- set_current_state(TASK_UNINTERRUPTIBLE);
- }
-
- set_current_state(TASK_RUNNING);
- remove_wait_queue(&awd.wqh, &wait);
-
- if (!timeout) {
+ if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
// timeout
kaweth_warn("usb_control/bulk_msg: timeout");
- usb_unlink_urb(urb); // remove urb safely
+ usb_kill_urb(urb); // remove urb safely
status = -ETIMEDOUT;
}
else {
git://git.onelab.eu / linux-2.6.git / blobdiff