Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149747
b: refs/heads/master
c: c76ccd6
h: refs/heads/master
i:
  149745: bb76ceb
  149743: 4313801
v: v3
  • Loading branch information
Alexander Beregalov authored and David S. Miller committed Apr 16, 2009
1 parent 452ea3b commit 6c41b9b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 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: 602355a03508bf54dbf113234ef72d75080a492d
refs/heads/master: c76ccd6a256004cca1127c9afb5474638fc78b74
15 changes: 11 additions & 4 deletions trunk/drivers/net/irda/pxaficp_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,16 @@ static int pxa_irda_init_iobuf(iobuff_t *io, int size)
return io->head ? 0 : -ENOMEM;
}

static const struct net_device_ops pxa_irda_netdev_ops = {
.ndo_open = pxa_irda_start,
.ndo_stop = pxa_irda_stop,
.ndo_start_xmit = pxa_irda_hard_xmit,
.ndo_do_ioctl = pxa_irda_ioctl,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
};

static int pxa_irda_probe(struct platform_device *pdev)
{
struct net_device *dev;
Expand Down Expand Up @@ -845,10 +855,7 @@ static int pxa_irda_probe(struct platform_device *pdev)
if (err)
goto err_startup;

dev->hard_start_xmit = pxa_irda_hard_xmit;
dev->open = pxa_irda_start;
dev->stop = pxa_irda_stop;
dev->do_ioctl = pxa_irda_ioctl;
dev->netdev_ops = &pxa_irda_netdev_ops;

irda_init_max_qos_capabilies(&si->qos);

Expand Down

0 comments on commit 6c41b9b

Please sign in to comment.