adm8668: add support for 3.3
[openwrt.git] / target / linux / adm8668 / patches-3.3 / a02-adm8668-network-driver-fixes.patch
1 --- a/arch/mips/adm8668/net_core.c
2 +++ b/arch/mips/adm8668/net_core.c
3 @@ -133,7 +133,7 @@ tulip_open(struct net_device *dev)
4  
5         tulip_init_ring (dev);
6  
7 -       retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev);
8 +       retval = request_irq(dev->irq, tulip_interrupt, 0, dev->name, dev);
9         if (retval)
10                 goto free_ring;
11  
12 @@ -469,7 +469,7 @@ static const struct net_device_ops tulip
13         .ndo_tx_timeout         = tulip_tx_timeout,
14         .ndo_stop               = tulip_close,
15         .ndo_get_stats          = tulip_get_stats,
16 -       .ndo_set_multicast_list = set_rx_mode,
17 +       .ndo_set_rx_mode        = set_rx_mode,
18         .ndo_change_mtu         = eth_change_mtu,
19         .ndo_set_mac_address    = eth_mac_addr,
20         .ndo_validate_addr      = eth_validate_addr,
21 @@ -509,6 +509,7 @@ static int __devinit adm8668net_probe(st
22         tp->dev = dev;
23         tp->base_addr = ioaddr;
24         tp->csr0 = csr0;
25 +       tp->pdev = pdev;
26         tp->rx_ring = dma_alloc_coherent(&pdev->dev,
27                                 sizeof(struct tulip_rx_desc) * RX_RING_SIZE +
28                                 sizeof(struct tulip_tx_desc) * TX_RING_SIZE,
29 --- a/arch/mips/adm8668/net.h
30 +++ b/arch/mips/adm8668/net.h
31 @@ -12,6 +12,7 @@
32  #define __NET_TULIP_H__
33  
34  #include <linux/module.h>
35 +#include <linux/export.h>
36  #include <linux/slab.h>
37  #include <linux/init.h>
38  #include <linux/mii.h>
39 @@ -25,10 +26,10 @@
40  #include <linux/delay.h>
41  #include <linux/etherdevice.h>
42  #include <linux/platform_device.h>
43 +#include <linux/io.h>
44 +#include <linux/interrupt.h>
45  #include <asm/unaligned.h>
46  #include <asm/uaccess.h>
47 -#include <asm/io.h>
48 -#include <asm/irq.h>
49  
50  /* undefine, or define to various debugging levels (>4 == obscene levels) */
51  #define TULIP_DEBUG 1