diff options
Diffstat (limited to 'drivers/net/irda/sa1100_ir.c')
-rw-r--r-- | drivers/net/irda/sa1100_ir.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 7a2b003954ca..2aeb2e6aec1b 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
27 | #include <linux/etherdevice.h> | ||
27 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
28 | #include <linux/rtnetlink.h> | 29 | #include <linux/rtnetlink.h> |
29 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
@@ -875,6 +876,16 @@ static int sa1100_irda_init_iobuf(iobuff_t *io, int size) | |||
875 | return io->head ? 0 : -ENOMEM; | 876 | return io->head ? 0 : -ENOMEM; |
876 | } | 877 | } |
877 | 878 | ||
879 | static const struct net_device_ops sa1100_irda_netdev_ops = { | ||
880 | .ndo_open = sa1100_irda_start, | ||
881 | .ndo_stop = sa1100_irda_stop, | ||
882 | .ndo_start_xmit = sa1100_irda_hard_xmit, | ||
883 | .ndo_do_ioctl = sa1100_irda_ioctl, | ||
884 | .ndo_change_mtu = eth_change_mtu, | ||
885 | .ndo_validate_addr = eth_validate_addr, | ||
886 | .ndo_set_mac_address = eth_mac_addr, | ||
887 | }; | ||
888 | |||
878 | static int sa1100_irda_probe(struct platform_device *pdev) | 889 | static int sa1100_irda_probe(struct platform_device *pdev) |
879 | { | 890 | { |
880 | struct net_device *dev; | 891 | struct net_device *dev; |
@@ -913,11 +924,8 @@ static int sa1100_irda_probe(struct platform_device *pdev) | |||
913 | if (err) | 924 | if (err) |
914 | goto err_mem_5; | 925 | goto err_mem_5; |
915 | 926 | ||
916 | dev->hard_start_xmit = sa1100_irda_hard_xmit; | 927 | dev->netdev_ops = &sa1100_irda_netdev_ops; |
917 | dev->open = sa1100_irda_start; | 928 | dev->irq = IRQ_Ser2ICP; |
918 | dev->stop = sa1100_irda_stop; | ||
919 | dev->do_ioctl = sa1100_irda_ioctl; | ||
920 | dev->irq = IRQ_Ser2ICP; | ||
921 | 929 | ||
922 | irda_init_max_qos_capabilies(&si->qos); | 930 | irda_init_max_qos_capabilies(&si->qos); |
923 | 931 | ||