projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 3.18 to 3.18.119
[openwrt/staging/mkresin.git]
/
target
/
linux
/
adm8668
/
patches-3.18
/
005-tulip_platform.patch
diff --git
a/target/linux/adm8668/patches-3.18/005-tulip_platform.patch
b/target/linux/adm8668/patches-3.18/005-tulip_platform.patch
index bddc572c669cc5ded507322c07a9970286f910ac..184a5d0a70aa9f95cd7d683caa920d111dc0048a 100644
(file)
--- a/
target/linux/adm8668/patches-3.18/005-tulip_platform.patch
+++ b/
target/linux/adm8668/patches-3.18/005-tulip_platform.patch
@@
-26,7
+26,7
@@
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/crc32.h>
#include <linux/delay.h>
#include <linux/mii.h>
#include <linux/crc32.h>
-@@ -20
4,6 +206
,9 @@ struct tulip_chip_table tulip_tbl[] = {
+@@ -20
3,6 +205
,9 @@ struct tulip_chip_table tulip_tbl[] = {
{ "Conexant LANfinity", 256, 0x0001ebef,
HAS_MII | HAS_ACPI, tulip_timer, tulip_media_task },
{ "Conexant LANfinity", 256, 0x0001ebef,
HAS_MII | HAS_ACPI, tulip_timer, tulip_media_task },
@@
-36,7
+36,7
@@
};
};
-@@ -37
7,6 +382
,11 @@ static void tulip_up(struct net_device *
+@@ -37
6,6 +381
,11 @@ static void tulip_up(struct net_device *
sizeof(tp->setup_frame),
PCI_DMA_TODEVICE);
#endif
sizeof(tp->setup_frame),
PCI_DMA_TODEVICE);
#endif
@@
-48,7
+48,7
@@
tp->tx_buffers[tp->cur_tx].skb = NULL;
tp->tx_buffers[tp->cur_tx].mapping = mapping;
tp->tx_buffers[tp->cur_tx].skb = NULL;
tp->tx_buffers[tp->cur_tx].mapping = mapping;
-@@ -39
6,6 +406
,7 @@ static void tulip_up(struct net_device *
+@@ -39
5,6 +405
,7 @@ static void tulip_up(struct net_device *
i = 0;
if (tp->mtable == NULL)
goto media_picked;
i = 0;
if (tp->mtable == NULL)
goto media_picked;
@@
-56,7
+56,7
@@
if (dev->if_port) {
int looking_for = tulip_media_cap[dev->if_port] & MediaIsMII ? 11 :
(dev->if_port == 12 ? 0 : dev->if_port);
if (dev->if_port) {
int looking_for = tulip_media_cap[dev->if_port] & MediaIsMII ? 11 :
(dev->if_port == 12 ? 0 : dev->if_port);
-@@ -48
9,6 +500
,10 @@ media_picked:
+@@ -48
8,6 +499
,10 @@ media_picked:
iowrite32(ioread32(ioaddr + 0x88) | 1, ioaddr + 0x88);
dev->if_port = tp->mii_cnt ? 11 : 0;
tp->csr6 = 0x00040000;
iowrite32(ioread32(ioaddr + 0x88) | 1, ioaddr + 0x88);
dev->if_port = tp->mii_cnt ? 11 : 0;
tp->csr6 = 0x00040000;
@@
-67,7
+67,7
@@
} else if (tp->chip_id == AX88140) {
tp->csr6 = tp->mii_cnt ? 0x00040100 : 0x00000100;
} else
} else if (tp->chip_id == AX88140) {
tp->csr6 = tp->mii_cnt ? 0x00040100 : 0x00000100;
} else
-@@ -6
60,6 +675
,10 @@ static void tulip_init_ring(struct net_d
+@@ -6
59,6 +674
,10 @@ static void tulip_init_ring(struct net_d
mapping = pci_map_single(tp->pdev, skb->data,
PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
#endif
mapping = pci_map_single(tp->pdev, skb->data,
PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
#endif
@@
-78,7
+78,7
@@
tp->rx_buffers[i].mapping = mapping;
tp->rx_ring[i].status = cpu_to_le32(DescOwned); /* Owned by Tulip chip */
tp->rx_ring[i].buffer1 = cpu_to_le32(mapping);
tp->rx_buffers[i].mapping = mapping;
tp->rx_ring[i].status = cpu_to_le32(DescOwned); /* Owned by Tulip chip */
tp->rx_ring[i].buffer1 = cpu_to_le32(mapping);
-@@ -69
6,6 +715
,11 @@ tulip_start_xmit(struct sk_buff *skb, st
+@@ -69
5,6 +714
,11 @@ tulip_start_xmit(struct sk_buff *skb, st
mapping = pci_map_single(tp->pdev, skb->data,
skb->len, PCI_DMA_TODEVICE);
#endif
mapping = pci_map_single(tp->pdev, skb->data,
skb->len, PCI_DMA_TODEVICE);
#endif
@@
-90,7
+90,7
@@
tp->tx_buffers[entry].mapping = mapping;
tp->tx_ring[entry].buffer1 = cpu_to_le32(mapping);
tp->tx_buffers[entry].mapping = mapping;
tp->tx_ring[entry].buffer1 = cpu_to_le32(mapping);
-@@ -75
2,6 +776
,13 @@ static void tulip_clean_tx_ring(struct t
+@@ -75
1,6 +775
,13 @@ static void tulip_clean_tx_ring(struct t
sizeof(tp->setup_frame),
PCI_DMA_TODEVICE);
#endif
sizeof(tp->setup_frame),
PCI_DMA_TODEVICE);
#endif
@@
-104,7
+104,7
@@
continue;
}
#ifdef CONFIG_TULIP_PCI
continue;
}
#ifdef CONFIG_TULIP_PCI
-@@ -75
9,6 +790
,11 @@ static void tulip_clean_tx_ring(struct t
+@@ -75
8,6 +789
,11 @@ static void tulip_clean_tx_ring(struct t
tp->tx_buffers[entry].skb->len,
PCI_DMA_TODEVICE);
#endif
tp->tx_buffers[entry].skb->len,
PCI_DMA_TODEVICE);
#endif
@@
-116,7
+116,7
@@
/* Free the original skb. */
dev_kfree_skb_irq(tp->tx_buffers[entry].skb);
/* Free the original skb. */
dev_kfree_skb_irq(tp->tx_buffers[entry].skb);
-@@ -83
6,6 +872
,10 @@ static void tulip_free_ring (struct net_
+@@ -83
5,6 +871
,10 @@ static void tulip_free_ring (struct net_
pci_unmap_single(tp->pdev, mapping, PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);
#endif
pci_unmap_single(tp->pdev, mapping, PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);
#endif
@@
-127,7
+127,7
@@
dev_kfree_skb (skb);
}
}
dev_kfree_skb (skb);
}
}
-@@ -84
8,6 +888
,10 @@ static void tulip_free_ring (struct net_
+@@ -84
7,6 +887
,10 @@ static void tulip_free_ring (struct net_
pci_unmap_single(tp->pdev, tp->tx_buffers[i].mapping,
skb->len, PCI_DMA_TODEVICE);
#endif
pci_unmap_single(tp->pdev, tp->tx_buffers[i].mapping,
skb->len, PCI_DMA_TODEVICE);
#endif
@@
-138,7
+138,7
@@
dev_kfree_skb (skb);
}
tp->tx_buffers[i].skb = NULL;
dev_kfree_skb (skb);
}
tp->tx_buffers[i].skb = NULL;
-@@ -90
2,6 +946
,9 @@ static void tulip_get_drvinfo(struct net
+@@ -90
1,6 +945
,9 @@ static void tulip_get_drvinfo(struct net
#ifdef CONFIG_TULIP_PCI
strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info));
#endif
#ifdef CONFIG_TULIP_PCI
strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info));
#endif
@@
-148,7
+148,7
@@
}
}
-@@ -91
7,6 +964
,9 @@ static int tulip_ethtool_set_wol(struct
+@@ -91
6,6 +963
,9 @@ static int tulip_ethtool_set_wol(struct
#ifdef CONFIG_TULIP_PCI
device_set_wakeup_enable(tp->kdev, tp->wolinfo.wolopts);
#endif
#ifdef CONFIG_TULIP_PCI
device_set_wakeup_enable(tp->kdev, tp->wolinfo.wolopts);
#endif
@@
-158,7
+158,7
@@
return 0;
}
return 0;
}
-@@ -119
2,13 +1242
,20 @@ static void set_rx_mode(struct net_devic
+@@ -119
1,13 +1241
,20 @@ static void set_rx_mode(struct net_devic
}
}
@@
-180,7
+180,7
@@
/* Put the setup frame on the Tx list. */
if (entry == TX_RING_SIZE-1)
tx_flags |= DESC_RING_WRAP; /* Wrap ring. */
/* Put the setup frame on the Tx list. */
if (entry == TX_RING_SIZE-1)
tx_flags |= DESC_RING_WRAP; /* Wrap ring. */
-@@ -121
8,6 +1275
,9 @@ static void set_rx_mode(struct net_devic
+@@ -121
7,6 +1274
,9 @@ static void set_rx_mode(struct net_devic
spin_unlock_irqrestore(&tp->lock, flags);
}
spin_unlock_irqrestore(&tp->lock, flags);
}
@@
-190,7
+190,7
@@
iowrite32(csr6, ioaddr + CSR6);
}
iowrite32(csr6, ioaddr + CSR6);
}
-@@ -198
4,6 +2044
,126 @@ static void tulip_remove_one(struct pci_
+@@ -198
3,6 +2043
,126 @@ static void tulip_remove_one(struct pci_
}
#endif /* CONFIG_TULIP_PCI */
}
#endif /* CONFIG_TULIP_PCI */
@@
-317,7
+317,7
@@
#ifdef CONFIG_NET_POLL_CONTROLLER
/*
* Polling 'interrupt' - used by things like netconsole to send skbs
#ifdef CONFIG_NET_POLL_CONTROLLER
/*
* Polling 'interrupt' - used by things like netconsole to send skbs
-@@ -201
7,6 +2197
,17 @@ static struct pci_driver tulip_pci_drive
+@@ -201
6,6 +2196
,17 @@ static struct pci_driver tulip_pci_drive
};
#endif
};
#endif
@@
-335,7
+335,7
@@
static int __init tulip_init (void)
{
static int __init tulip_init (void)
{
-@@ -203
3,6 +2224
,9 @@ static int __init tulip_init (void)
+@@ -203
8,6 +2229
,9 @@ static int __init tulip_init (void)
#ifdef CONFIG_TULIP_PCI
ret = pci_register_driver(&tulip_pci_driver);
#endif
#ifdef CONFIG_TULIP_PCI
ret = pci_register_driver(&tulip_pci_driver);
#endif
@@
-345,7
+345,7
@@
return ret;
}
return ret;
}
-@@ -204
2,6 +2236
,9 @@ static void __exit tulip_cleanup (void)
+@@ -204
7,6 +2241
,9 @@ static void __exit tulip_cleanup (void)
#ifdef CONFIG_TULIP_PCI
pci_unregister_driver (&tulip_pci_driver);
#endif
#ifdef CONFIG_TULIP_PCI
pci_unregister_driver (&tulip_pci_driver);
#endif