Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6
* 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
sis900: phy for FoxCon motherboard
dl2k: use DMA_48BIT_MASK constant
phy: mdiobus_register(): initialize all phy_map entries
sky2: ifdown kills irq mask
+14
-9
+6
-6
drivers/net/dl2k.c
+6
-6
drivers/net/dl2k.c
···
765
765
break;
766
766
skb = np->tx_skbuff[entry];
767
767
pci_unmap_single (np->pdev,
768
-
np->tx_ring[entry].fraginfo & 0xffffffffffff,
768
+
np->tx_ring[entry].fraginfo & DMA_48BIT_MASK,
769
769
skb->len, PCI_DMA_TODEVICE);
770
770
if (irq)
771
771
dev_kfree_skb_irq (skb);
···
893
893
/* Small skbuffs for short packets */
894
894
if (pkt_len > copy_thresh) {
895
895
pci_unmap_single (np->pdev,
896
-
desc->fraginfo & 0xffffffffffff,
896
+
desc->fraginfo & DMA_48BIT_MASK,
897
897
np->rx_buf_sz,
898
898
PCI_DMA_FROMDEVICE);
899
899
skb_put (skb = np->rx_skbuff[entry], pkt_len);
···
901
901
} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
902
902
pci_dma_sync_single_for_cpu(np->pdev,
903
903
desc->fraginfo &
904
-
0xffffffffffff,
904
+
DMA_48BIT_MASK,
905
905
np->rx_buf_sz,
906
906
PCI_DMA_FROMDEVICE);
907
907
skb->dev = dev;
···
913
913
skb_put (skb, pkt_len);
914
914
pci_dma_sync_single_for_device(np->pdev,
915
915
desc->fraginfo &
916
-
0xffffffffffff,
916
+
DMA_48BIT_MASK,
917
917
np->rx_buf_sz,
918
918
PCI_DMA_FROMDEVICE);
919
919
}
···
1800
1800
skb = np->rx_skbuff[i];
1801
1801
if (skb) {
1802
1802
pci_unmap_single(np->pdev,
1803
-
np->rx_ring[i].fraginfo & 0xffffffffffff,
1803
+
np->rx_ring[i].fraginfo & DMA_48BIT_MASK,
1804
1804
skb->len, PCI_DMA_FROMDEVICE);
1805
1805
dev_kfree_skb (skb);
1806
1806
np->rx_skbuff[i] = NULL;
···
1810
1810
skb = np->tx_skbuff[i];
1811
1811
if (skb) {
1812
1812
pci_unmap_single(np->pdev,
1813
-
np->tx_ring[i].fraginfo & 0xffffffffffff,
1813
+
np->tx_ring[i].fraginfo & DMA_48BIT_MASK,
1814
1814
skb->len, PCI_DMA_TODEVICE);
1815
1815
dev_kfree_skb (skb);
1816
1816
np->tx_skbuff[i] = NULL;
+3
-1
drivers/net/phy/mdio_bus.c
+3
-1
drivers/net/phy/mdio_bus.c
+1
drivers/net/sis900.c
+1
drivers/net/sis900.c
···
127
127
} mii_chip_table[] = {
128
128
{ "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN },
129
129
{ "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN },
130
+
{ "SiS 900 on Foxconn 661 7MI", 0x0143, 0xBC70, LAN },
130
131
{ "Altimata AC101LF PHY", 0x0022, 0x5520, LAN },
131
132
{ "ADM 7001 LAN PHY", 0x002e, 0xcc60, LAN },
132
133
{ "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN },
+3
-2
drivers/net/sky2.c
+3
-2
drivers/net/sky2.c
···
128
128
/* Avoid conditionals by using array */
129
129
static const unsigned txqaddr[] = { Q_XA1, Q_XA2 };
130
130
static const unsigned rxqaddr[] = { Q_R1, Q_R2 };
131
+
static const u32 portirq_msk[] = { Y2_IS_PORT_1, Y2_IS_PORT_2 };
131
132
132
133
/* This driver supports yukon2 chipset only */
133
134
static const char *yukon2_name[] = {
···
1085
1084
1086
1085
/* Enable interrupts from phy/mac for port */
1087
1086
imask = sky2_read32(hw, B0_IMSK);
1088
-
imask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2;
1087
+
imask |= portirq_msk[port];
1089
1088
sky2_write32(hw, B0_IMSK, imask);
1090
1089
1091
1090
return 0;
···
1436
1435
1437
1436
/* Disable port IRQ */
1438
1437
imask = sky2_read32(hw, B0_IMSK);
1439
-
imask &= ~(sky2->port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2;
1438
+
imask &= ~portirq_msk[port];
1440
1439
sky2_write32(hw, B0_IMSK, imask);
1441
1440
1442
1441
/* turn off LED's */
+1
include/linux/dma-mapping.h
+1
include/linux/dma-mapping.h