From c3ea813cc8c2985310daf56141a236be875a5053 Mon Sep 17 00:00:00 2001 From: Don Skidmore Date: Fri, 7 Oct 2011 03:53:51 +0000 Subject: [PATCH] --- yaml --- r: 266455 b: refs/heads/master c: 19d478bbe690a37489f58843dec20a456573d89f h: refs/heads/master i: 266453: 92d0998f5a8182c6e4e30157fe70e834bae5ff64 266451: 8d1f66ccd7d8d46328bf6eacfed62a6b0b2d325e 266447: ddfc60833cafba692cec25191d9b2856823ca495 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/amso1100/c2.c | 3 +- trunk/drivers/infiniband/hw/nes/nes_nic.c | 4 +-- trunk/drivers/net/ethernet/alteon/acenic.c | 2 +- .../net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- .../net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- .../drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2.c | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 4 +-- trunk/drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- .../drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- .../net/ethernet/cisco/enic/enic_main.c | 4 +-- .../net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-- trunk/drivers/net/ethernet/marvell/skge.c | 2 +- trunk/drivers/net/ethernet/marvell/sky2.c | 8 ++--- .../net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- trunk/drivers/net/ethernet/natsemi/ns83820.c | 2 +- trunk/drivers/net/ethernet/neterion/s2io.c | 2 +- trunk/drivers/net/ethernet/nvidia/forcedeth.c | 4 +-- .../drivers/net/ethernet/pasemi/pasemi_mac.c | 4 +-- .../ethernet/qlogic/netxen/netxen_nic_main.c | 4 +-- trunk/drivers/net/ethernet/qlogic/qla3xxx.c | 4 +-- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +-- .../net/ethernet/qlogic/qlge/qlge_main.c | 4 +-- trunk/drivers/net/ethernet/sfc/tx.c | 6 ++-- trunk/drivers/net/ethernet/sun/cassini.c | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 2 +- trunk/drivers/net/ethernet/tehuti/tehuti.c | 2 +- trunk/drivers/net/ethernet/via/via-velocity.c | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- trunk/drivers/staging/et131x/et1310_tx.c | 2 +- trunk/include/net/dcbevent.h | 18 ----------- trunk/include/net/dcbnl.h | 3 +- trunk/net/dcb/dcbnl.c | 30 ++++++++----------- 34 files changed, 60 insertions(+), 84 deletions(-) diff --git a/[refs] b/[refs] index 867fa52b03af..360d32f323e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d6bcdfe38ce883946aebf751a64695471ce1ab5 +refs/heads/master: 19d478bbe690a37489f58843dec20a456573d89f diff --git a/trunk/drivers/infiniband/hw/amso1100/c2.c b/trunk/drivers/infiniband/hw/amso1100/c2.c index 6e85a75289e8..6a8f36e9d9ed 100644 --- a/trunk/drivers/infiniband/hw/amso1100/c2.c +++ b/trunk/drivers/infiniband/hw/amso1100/c2.c @@ -803,7 +803,8 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev) skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; maplen = frag->size; mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag, - 0, maplen, DMA_TO_DEVICE); + 0, maplen, + PCI_DMA_TODEVICE); elem = elem->next; elem->skb = NULL; elem->mapaddr = mapaddr; diff --git a/trunk/drivers/infiniband/hw/nes/nes_nic.c b/trunk/drivers/infiniband/hw/nes/nes_nic.c index 7cb7f292dfd1..96cb35a8e317 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_nic.c +++ b/trunk/drivers/infiniband/hw/nes/nes_nic.c @@ -445,7 +445,7 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev) &skb_shinfo(skb)->frags[skb_fragment_index]; bus_address = skb_frag_dma_map(&nesdev->pcidev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); wqe_fragment_length[wqe_fragment_index] = cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size); set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index), @@ -566,7 +566,7 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) tso_bus_address[tso_frag_count] = skb_frag_dma_map(&nesdev->pcidev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); } tso_frag_index = 0; diff --git a/trunk/drivers/net/ethernet/alteon/acenic.c b/trunk/drivers/net/ethernet/alteon/acenic.c index b1a4e8204437..8794cf831bd0 100644 --- a/trunk/drivers/net/ethernet/alteon/acenic.c +++ b/trunk/drivers/net/ethernet/alteon/acenic.c @@ -2487,7 +2487,7 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb, mapping = skb_frag_dma_map(&ap->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); flagsize = (frag->size << 16); if (skb->ip_summed == CHECKSUM_PARTIAL) diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 12a0b30319db..2b9f925fdfc0 100644 --- a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -2183,7 +2183,7 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter, buffer_info->dma = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, buffer_info->length, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY); ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE, ATL1C_PCIMAP_TODEVICE); diff --git a/trunk/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/trunk/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 97c45a4b855a..7e27eb354f10 100644 --- a/trunk/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/trunk/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -1769,7 +1769,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter, frag, (i * MAX_TX_BUF_LEN), tx_buffer->length, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE); use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma); use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) | diff --git a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c index 43511ab8dd27..edf826a50281 100644 --- a/trunk/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/trunk/drivers/net/ethernet/atheros/atlx/atl1.c @@ -2285,7 +2285,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, buf_len -= buffer_info->length; buffer_info->dma = skb_frag_dma_map(&adapter->pdev->dev, frag, i * ATL1_MAX_TX_BUF_LEN, - buffer_info->length, DMA_TO_DEVICE); + buffer_info->length, PCI_DMA_TODEVICE); if (++next_to_use == tpd_ring->count) next_to_use = 0; diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c index ad24d8c0b8a7..21bdda3766b1 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c @@ -6539,7 +6539,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) len = frag->size; mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); if (dma_mapping_error(&bp->pdev->dev, mapping)) goto dma_error; dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping, diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 9dbd1af6653c..26c6bd44a604 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -6779,12 +6779,12 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) len = frag->size; mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, - len, DMA_TO_DEVICE); + len, PCI_DMA_TODEVICE); tnapi->tx_buffers[entry].skb = NULL; dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping, mapping); - if (dma_mapping_error(&tp->pdev->dev, mapping)) + if (pci_dma_mapping_error(tp->pdev, mapping)) goto dma_error; if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping, diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c index 0a511c4a0472..7cde425f2b84 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c @@ -1278,7 +1278,7 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb, } mapping = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); + frag->size, PCI_DMA_TODEVICE); desc_mapping = mapping; desc_len = frag->size; diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c index 2f46b37e5d16..a0baaa09f025 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -980,7 +980,7 @@ static inline unsigned int make_sgl(const struct sk_buff *skb, skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; mapping = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); sgp->len[j] = cpu_to_be32(frag->size); sgp->addr[j] = cpu_to_be64(mapping); j ^= 1; diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c index 1bc908f595de..aeab6cd44fcf 100644 --- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c @@ -607,7 +607,7 @@ static inline void enic_queue_wq_skb_cont(struct enic *enic, enic_queue_wq_desc_cont(wq, skb, skb_frag_dma_map(&enic->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE), + PCI_DMA_TODEVICE), frag->size, (len_left == 0), /* EOP? */ loopback); @@ -726,7 +726,7 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic, (unsigned int)WQ_ENET_MAX_DESC_LEN); dma_addr = skb_frag_dma_map(&enic->pdev->dev, frag, offset, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); enic_queue_wq_desc_cont(wq, skb, dma_addr, len, diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 1f936c88ec67..1519a23421af 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -56,8 +56,8 @@ char ixgbe_driver_name[] = "ixgbe"; static const char ixgbe_driver_string[] = "Intel(R) 10 Gigabit PCI Express Network Driver"; #define MAJ 3 -#define MIN 4 -#define BUILD 8 +#define MIN 6 +#define BUILD 7 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \ __stringify(BUILD) "-k" const char ixgbe_driver_version[] = DRV_VERSION; diff --git a/trunk/drivers/net/ethernet/marvell/skge.c b/trunk/drivers/net/ethernet/marvell/skge.c index 32db4c877ff1..a0a647154245 100644 --- a/trunk/drivers/net/ethernet/marvell/skge.c +++ b/trunk/drivers/net/ethernet/marvell/skge.c @@ -2777,7 +2777,7 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb, skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; map = skb_frag_dma_map(&hw->pdev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); + frag->size, PCI_DMA_TODEVICE); e = e->next; e->skb = skb; diff --git a/trunk/drivers/net/ethernet/marvell/sky2.c b/trunk/drivers/net/ethernet/marvell/sky2.c index a3ce9b6d36af..338b10c6f52e 100644 --- a/trunk/drivers/net/ethernet/marvell/sky2.c +++ b/trunk/drivers/net/ethernet/marvell/sky2.c @@ -1229,9 +1229,9 @@ static int sky2_rx_map_skb(struct pci_dev *pdev, struct rx_ring_info *re, re->frag_addr[i] = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, - DMA_FROM_DEVICE); + PCI_DMA_FROMDEVICE); - if (dma_mapping_error(&pdev->dev, re->frag_addr[i])) + if (pci_dma_mapping_error(pdev, re->frag_addr[i])) goto map_page_error; } return 0; @@ -1936,9 +1936,9 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb, const skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; mapping = skb_frag_dma_map(&hw->pdev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); + frag->size, PCI_DMA_TODEVICE); - if (dma_mapping_error(&hw->pdev->dev, mapping)) + if (pci_dma_mapping_error(hw->pdev, mapping)) goto mapping_unwind; upper = upper_32_bits(mapping); diff --git a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 26637279cd67..8bf60348844d 100644 --- a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -2928,7 +2928,7 @@ static netdev_tx_t myri10ge_xmit(struct sk_buff *skb, frag_idx++; len = frag->size; bus = skb_frag_dma_map(&mgp->pdev->dev, frag, 0, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); dma_unmap_addr_set(&tx->info[idx], bus, bus); dma_unmap_len_set(&tx->info[idx], len, len); } diff --git a/trunk/drivers/net/ethernet/natsemi/ns83820.c b/trunk/drivers/net/ethernet/natsemi/ns83820.c index 73616b911327..e0895e40f10a 100644 --- a/trunk/drivers/net/ethernet/natsemi/ns83820.c +++ b/trunk/drivers/net/ethernet/natsemi/ns83820.c @@ -1161,7 +1161,7 @@ static netdev_tx_t ns83820_hard_start_xmit(struct sk_buff *skb, break; buf = skb_frag_dma_map(&dev->pci_dev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); + frag->size, PCI_DMA_TODEVICE); dprintk("frag: buf=%08Lx page=%08lx offset=%08lx\n", (long long)buf, (long) page_to_pfn(frag->page), frag->page_offset); diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c index 4ec7e3f46cc6..ef5b825a9a9c 100644 --- a/trunk/drivers/net/ethernet/neterion/s2io.c +++ b/trunk/drivers/net/ethernet/neterion/s2io.c @@ -4193,7 +4193,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) txdp->Buffer_Pointer = (u64)skb_frag_dma_map(&sp->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); if (offload_type == SKB_GSO_UDP) txdp->Control_1 |= TXD_UFO_EN; diff --git a/trunk/drivers/net/ethernet/nvidia/forcedeth.c b/trunk/drivers/net/ethernet/nvidia/forcedeth.c index 84baa59430bb..4e39b8c04397 100644 --- a/trunk/drivers/net/ethernet/nvidia/forcedeth.c +++ b/trunk/drivers/net/ethernet/nvidia/forcedeth.c @@ -2150,7 +2150,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev) &np->pci_dev->dev, frag, offset, bcnt, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); np->put_tx_ctx->dma_len = bcnt; np->put_tx_ctx->dma_single = 0; put_tx->buf = cpu_to_le32(np->put_tx_ctx->dma); @@ -2264,7 +2264,7 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb, &np->pci_dev->dev, frag, offset, bcnt, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); np->put_tx_ctx->dma_len = bcnt; np->put_tx_ctx->dma_single = 0; put_tx->bufhigh = cpu_to_le32(dma_high(np->put_tx_ctx->dma)); diff --git a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c index c6f005684677..532209588323 100644 --- a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -1506,9 +1506,9 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; map[i + 1] = skb_frag_dma_map(&mac->dma_pdev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); + frag->size, PCI_DMA_TODEVICE); map_size[i+1] = frag->size; - if (dma_mapping_error(&mac->dma_pdev->dev, map[i + 1])) { + if (pci_dma_mapping_error(mac->dma_pdev, map[i+1])) { nfrags = i; goto out_err_nolock; } diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index e2ba78be1c2a..dc9e21af2dd1 100644 --- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1906,8 +1906,8 @@ netxen_map_tx_skb(struct pci_dev *pdev, nf = &pbuf->frag_array[i+1]; map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); - if (dma_mapping_error(&pdev->dev, map)) + PCI_DMA_TODEVICE); + if (pci_dma_mapping_error(pdev, map)) goto unwind; nf->dma = map; diff --git a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c index 46f9b6499f9b..1871d88ee712 100644 --- a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c @@ -2389,9 +2389,9 @@ static int ql_send_map(struct ql3_adapter *qdev, } map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); - err = dma_mapping_error(&qdev->pdev->dev, map); + err = pci_dma_mapping_error(qdev->pdev, map); if (err) { netdev_err(qdev->ndev, "PCI mapping frags failed with error: %d\n", diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index eac19e7d2761..445956e2d045 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2136,8 +2136,8 @@ qlcnic_map_tx_skb(struct pci_dev *pdev, nf = &pbuf->frag_array[i+1]; map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); - if (dma_mapping_error(&pdev->dev, map)) + PCI_DMA_TODEVICE); + if (pci_dma_mapping_error(pdev, map)) goto unwind; nf->dma = map; diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c index f2d9bb78ec7f..ce6c6fee3089 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -1432,9 +1432,9 @@ static int ql_map_send(struct ql_adapter *qdev, } map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); - err = dma_mapping_error(&qdev->pdev->dev, map); + err = pci_dma_mapping_error(qdev->pdev, map); if (err) { netif_err(qdev, tx_queued, qdev->ndev, "PCI mapping frags failed with error: %d.\n", diff --git a/trunk/drivers/net/ethernet/sfc/tx.c b/trunk/drivers/net/ethernet/sfc/tx.c index 3964a62dde8b..f2467a1b51bd 100644 --- a/trunk/drivers/net/ethernet/sfc/tx.c +++ b/trunk/drivers/net/ethernet/sfc/tx.c @@ -243,7 +243,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) /* Map for DMA */ unmap_single = false; dma_addr = skb_frag_dma_map(&pci_dev->dev, fragment, 0, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); } /* Transfer ownership of the skb to the final buffer */ @@ -926,8 +926,8 @@ static int tso_get_fragment(struct tso_state *st, struct efx_nic *efx, skb_frag_t *frag) { st->unmap_addr = skb_frag_dma_map(&efx->pci_dev->dev, frag, 0, - frag->size, DMA_TO_DEVICE); - if (likely(!dma_mapping_error(&efx->pci_dev->dev, st->unmap_addr))) { + frag->size, PCI_DMA_TODEVICE); + if (likely(!pci_dma_mapping_error(efx->pci_dev, st->unmap_addr))) { st->unmap_single = false; st->unmap_len = frag->size; st->in_len = frag->size; diff --git a/trunk/drivers/net/ethernet/sun/cassini.c b/trunk/drivers/net/ethernet/sun/cassini.c index d9460d81a137..12068219059a 100644 --- a/trunk/drivers/net/ethernet/sun/cassini.c +++ b/trunk/drivers/net/ethernet/sun/cassini.c @@ -2830,7 +2830,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, len = fragp->size; mapping = skb_frag_dma_map(&cp->pdev->dev, fragp, 0, len, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); tabort = cas_calc_tabort(cp, fragp->page_offset, len); if (unlikely(tabort)) { diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c index 6b62a73227c2..2bfa1715fe23 100644 --- a/trunk/drivers/net/ethernet/sun/sungem.c +++ b/trunk/drivers/net/ethernet/sun/sungem.c @@ -1072,7 +1072,7 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb, len = this_frag->size; mapping = skb_frag_dma_map(&gp->pdev->dev, this_frag, - 0, len, DMA_TO_DEVICE); + 0, len, PCI_DMA_TODEVICE); this_ctrl = ctrl; if (frag == skb_shinfo(skb)->nr_frags - 1) this_ctrl |= TXDCTRL_EOF; diff --git a/trunk/drivers/net/ethernet/tehuti/tehuti.c b/trunk/drivers/net/ethernet/tehuti/tehuti.c index c77e3bf4750a..1151cf994cde 100644 --- a/trunk/drivers/net/ethernet/tehuti/tehuti.c +++ b/trunk/drivers/net/ethernet/tehuti/tehuti.c @@ -1499,7 +1499,7 @@ bdx_tx_map_skb(struct bdx_priv *priv, struct sk_buff *skb, db->wptr->len = frag->size; db->wptr->addr.dma = skb_frag_dma_map(&priv->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); pbl++; pbl->len = CPU_CHIP_SWAP32(db->wptr->len); diff --git a/trunk/drivers/net/ethernet/via/via-velocity.c b/trunk/drivers/net/ethernet/via/via-velocity.c index b47bce1a2e2a..1ec32c424e07 100644 --- a/trunk/drivers/net/ethernet/via/via-velocity.c +++ b/trunk/drivers/net/ethernet/via/via-velocity.c @@ -2559,7 +2559,7 @@ static netdev_tx_t velocity_xmit(struct sk_buff *skb, tdinfo->skb_dma[i + 1] = skb_frag_dma_map(&vptr->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); td_ptr->td_buf[i + 1].pa_low = cpu_to_le32(tdinfo->skb_dma[i + 1]); td_ptr->td_buf[i + 1].pa_high = 0; diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index 1694038192e0..57e7c66a9057 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -750,7 +750,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, tbi->map_type = VMXNET3_MAP_PAGE; tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, frag->size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); tbi->len = frag->size; diff --git a/trunk/drivers/staging/et131x/et1310_tx.c b/trunk/drivers/staging/et131x/et1310_tx.c index e4f51e64c7a8..03e7a4ea510d 100644 --- a/trunk/drivers/staging/et131x/et1310_tx.c +++ b/trunk/drivers/staging/et131x/et1310_tx.c @@ -524,7 +524,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, struct tcb *tcb) &frags[i - 1], 0, frags[i - 1].size, - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); } } diff --git a/trunk/include/net/dcbevent.h b/trunk/include/net/dcbevent.h index 443626ed4cbc..bc1e7ef40171 100644 --- a/trunk/include/net/dcbevent.h +++ b/trunk/include/net/dcbevent.h @@ -24,26 +24,8 @@ enum dcbevent_notif_type { DCB_APP_EVENT = 1, }; -#ifdef CONFIG_DCB extern int register_dcbevent_notifier(struct notifier_block *nb); extern int unregister_dcbevent_notifier(struct notifier_block *nb); extern int call_dcbevent_notifiers(unsigned long val, void *v); -#else -static inline int -register_dcbevent_notifier(struct notifier_block *nb) -{ - return 0; -} - -static inline int unregister_dcbevent_notifier(struct notifier_block *nb) -{ - return 0; -} - -static inline int call_dcbevent_notifiers(unsigned long val, void *v) -{ - return 0; -} -#endif /* CONFIG_DCB */ #endif diff --git a/trunk/include/net/dcbnl.h b/trunk/include/net/dcbnl.h index 2cd66d0be348..f5aa39997f0b 100644 --- a/trunk/include/net/dcbnl.h +++ b/trunk/include/net/dcbnl.h @@ -23,10 +23,9 @@ #include struct dcb_app_type { - int ifindex; + char name[IFNAMSIZ]; struct dcb_app app; struct list_head list; - u8 dcbx; }; int dcb_setapp(struct net_device *, struct dcb_app *); diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c index 9bfbc1d1b50c..3cb56af4e13c 100644 --- a/trunk/net/dcb/dcbnl.c +++ b/trunk/net/dcb/dcbnl.c @@ -1255,7 +1255,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev) spin_lock(&dcb_lock); list_for_each_entry(itr, &dcb_app_list, list) { - if (itr->ifindex == netdev->ifindex) { + if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) { err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr->app), &itr->app); if (err) { @@ -1412,7 +1412,7 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev) goto dcb_unlock; list_for_each_entry(itr, &dcb_app_list, list) { - if (itr->ifindex == netdev->ifindex) { + if (strncmp(itr->name, netdev->name, IFNAMSIZ) == 0) { struct nlattr *app_nest = nla_nest_start(skb, DCB_ATTR_APP); if (!app_nest) @@ -2050,7 +2050,7 @@ u8 dcb_getapp(struct net_device *dev, struct dcb_app *app) list_for_each_entry(itr, &dcb_app_list, list) { if (itr->app.selector == app->selector && itr->app.protocol == app->protocol && - itr->ifindex == dev->ifindex) { + (strncmp(itr->name, dev->name, IFNAMSIZ) == 0)) { prio = itr->app.priority; break; } @@ -2073,17 +2073,15 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new) struct dcb_app_type *itr; struct dcb_app_type event; - event.ifindex = dev->ifindex; + memcpy(&event.name, dev->name, sizeof(event.name)); memcpy(&event.app, new, sizeof(event.app)); - if (dev->dcbnl_ops->getdcbx) - event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and replace */ list_for_each_entry(itr, &dcb_app_list, list) { if (itr->app.selector == new->selector && itr->app.protocol == new->protocol && - itr->ifindex == dev->ifindex) { + (strncmp(itr->name, dev->name, IFNAMSIZ) == 0)) { if (new->priority) itr->app.priority = new->priority; else { @@ -2103,7 +2101,7 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new) } memcpy(&entry->app, new, sizeof(*new)); - entry->ifindex = dev->ifindex; + strncpy(entry->name, dev->name, IFNAMSIZ); list_add(&entry->list, &dcb_app_list); } out: @@ -2129,7 +2127,7 @@ u8 dcb_ieee_getapp_mask(struct net_device *dev, struct dcb_app *app) list_for_each_entry(itr, &dcb_app_list, list) { if (itr->app.selector == app->selector && itr->app.protocol == app->protocol && - itr->ifindex == dev->ifindex) { + (strncmp(itr->name, dev->name, IFNAMSIZ) == 0)) { prio |= 1 << itr->app.priority; } } @@ -2152,10 +2150,8 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new) struct dcb_app_type event; int err = 0; - event.ifindex = dev->ifindex; + memcpy(&event.name, dev->name, sizeof(event.name)); memcpy(&event.app, new, sizeof(event.app)); - if (dev->dcbnl_ops->getdcbx) - event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and abort if found */ @@ -2163,7 +2159,7 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new) if (itr->app.selector == new->selector && itr->app.protocol == new->protocol && itr->app.priority == new->priority && - itr->ifindex == dev->ifindex) { + (strncmp(itr->name, dev->name, IFNAMSIZ) == 0)) { err = -EEXIST; goto out; } @@ -2177,7 +2173,7 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new) } memcpy(&entry->app, new, sizeof(*new)); - entry->ifindex = dev->ifindex; + strncpy(entry->name, dev->name, IFNAMSIZ); list_add(&entry->list, &dcb_app_list); out: spin_unlock(&dcb_lock); @@ -2198,10 +2194,8 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del) struct dcb_app_type event; int err = -ENOENT; - event.ifindex = dev->ifindex; + memcpy(&event.name, dev->name, sizeof(event.name)); memcpy(&event.app, del, sizeof(event.app)); - if (dev->dcbnl_ops->getdcbx) - event.dcbx = dev->dcbnl_ops->getdcbx(dev); spin_lock(&dcb_lock); /* Search for existing match and remove it. */ @@ -2209,7 +2203,7 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del) if (itr->app.selector == del->selector && itr->app.protocol == del->protocol && itr->app.priority == del->priority && - itr->ifindex == dev->ifindex) { + (strncmp(itr->name, dev->name, IFNAMSIZ) == 0)) { list_del(&itr->list); kfree(itr); err = 0;