Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 127843
b: refs/heads/master
c: 321ea8b
h: refs/heads/master
i:
  127841: cf23c3e
  127839: e362ad5
v: v3
  • Loading branch information
Oliver Neukum authored and David S. Miller committed Jan 8, 2009
1 parent 22575bb commit f14fb33
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 283a21d3e16e9709012cc8b0839ec474d8888a5d
refs/heads/master: 321ea8b2d37e1e09e65415c421403b40d7d81c1c
23 changes: 12 additions & 11 deletions trunk/drivers/net/usb/kaweth.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ struct kaweth_device
struct net_device_stats stats;
};


/****************************************************************
* kaweth_control
****************************************************************/
Expand Down Expand Up @@ -975,6 +974,17 @@ static int kaweth_resume(struct usb_interface *intf)
/****************************************************************
* kaweth_probe
****************************************************************/


static const struct net_device_ops kaweth_netdev_ops = {
.ndo_open = kaweth_open,
.ndo_stop = kaweth_close,
.ndo_start_xmit = kaweth_start_xmit,
.ndo_tx_timeout = kaweth_tx_timeout,
.ndo_set_multicast_list = kaweth_set_rx_mode,
.ndo_get_stats = kaweth_netdev_stats,
};

static int kaweth_probe(
struct usb_interface *intf,
const struct usb_device_id *id /* from id_table */
Expand Down Expand Up @@ -1147,22 +1157,13 @@ static int kaweth_probe(
memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr,
sizeof(kaweth->configuration.hw_addr));

netdev->open = kaweth_open;
netdev->stop = kaweth_close;

netdev->netdev_ops = &kaweth_netdev_ops;
netdev->watchdog_timeo = KAWETH_TX_TIMEOUT;
netdev->tx_timeout = kaweth_tx_timeout;

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);

/* kaweth is zeroed as part of alloc_netdev */

INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);

usb_set_intfdata(intf, kaweth);

#if 0
Expand Down

0 comments on commit f14fb33

Please sign in to comment.