# HG changeset patch # User Florian Pose # Date 1262947227 -3600 # Node ID c6779ebcda88f861f9889676752ed19c2121ba49 # Parent 7c49cd56f96f2c8fa424c96afd29da6e183d73e3 Removed tabulators. diff -r 7c49cd56f96f -r c6779ebcda88 devices/generic.c --- a/devices/generic.c Fri Jan 08 11:26:07 2010 +0100 +++ b/devices/generic.c Fri Jan 08 11:40:27 2010 +0100 @@ -70,16 +70,16 @@ typedef struct { struct list_head list; struct net_device *netdev; - struct net_device *used_netdev; - struct socket *socket; + struct net_device *used_netdev; + struct socket *socket; ec_device_t *ecdev; uint8_t *rx_buf; } ec_gen_device_t; typedef struct { struct list_head list; - struct net_device *netdev; - char name[IFNAMSIZ]; + struct net_device *netdev; + char name[IFNAMSIZ]; int ifindex; uint8_t dev_addr[ETH_ALEN]; } ec_gen_interface_desc_t; @@ -202,7 +202,7 @@ int ret; struct sockaddr_ll sa; - dev->rx_buf = kmalloc(EC_GEN_RX_BUF_SIZE, GFP_KERNEL); + dev->rx_buf = kmalloc(EC_GEN_RX_BUF_SIZE, GFP_KERNEL); if (!dev->rx_buf) { return -ENOMEM; } @@ -242,8 +242,8 @@ { int ret = 0; - dev->used_netdev = desc->netdev; - memcpy(dev->netdev->dev_addr, desc->dev_addr, ETH_ALEN); + dev->used_netdev = desc->netdev; + memcpy(dev->netdev->dev_addr, desc->dev_addr, ETH_ALEN); dev->ecdev = ecdev_offer(dev->netdev, ec_gen_poll, THIS_MODULE); if (dev->ecdev) { @@ -254,7 +254,7 @@ ecdev_withdraw(dev->ecdev); dev->ecdev = NULL; } else { - ecdev_set_link(dev->ecdev, netif_carrier_ok(dev->used_netdev)); // FIXME + ecdev_set_link(dev->ecdev, netif_carrier_ok(dev->used_netdev)); // FIXME ret = 1; } } @@ -296,7 +296,7 @@ size_t len = skb->len; int ret; - ecdev_set_link(dev->ecdev,netif_carrier_ok(dev->used_netdev)); + ecdev_set_link(dev->ecdev, netif_carrier_ok(dev->used_netdev)); iov.iov_base = skb->data; iov.iov_len = len; @@ -319,8 +319,9 @@ struct kvec iov; int ret, budget = 10; // FIXME - ecdev_set_link(dev->ecdev,netif_carrier_ok(dev->used_netdev)); - do { + ecdev_set_link(dev->ecdev, netif_carrier_ok(dev->used_netdev)); + + do { iov.iov_base = dev->rx_buf; iov.iov_len = EC_GEN_RX_BUF_SIZE; memset(&msg, 0, sizeof(msg)); @@ -414,7 +415,7 @@ goto out_err; } strncpy(desc->name, netdev->name, IFNAMSIZ); - desc->netdev = netdev; + desc->netdev = netdev; desc->ifindex = netdev->ifindex; memcpy(desc->dev_addr, netdev->dev_addr, ETH_ALEN); list_add_tail(&desc->list, &descs);