diff options
| author | Madalin Bucur <madalin.bucur@freescale.com> | 2013-04-19 22:35:15 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-24 15:39:27 (GMT) |
| commit | ec6aa02560e69e08b4ef1be02fb066d9d70529ee (patch) | |
| tree | fb129ee492b7d70257e1df3046401e10a48587a9 /drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | |
| parent | cb16a6587aee47027b7b4766db2d21c784b65114 (diff) | |
| download | linux-fsl-qoriq-ec6aa02560e69e08b4ef1be02fb066d9d70529ee.tar.xz | |
dpaa_eth: use FSL_DPAA_ETH prefix for all config options
Use consistent naming for Kconfig options in DPAA Ethernet driver.
Also updated default configs.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Change-Id: I5603919a9d0649741a9494caed3826605b131903
Reviewed-on: http://git.am.freescale.net:8181/1720
Reviewed-by: Sovaiala Cristian-Constantin-B39531 <Cristian.Sovaiala@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c index 48f32fe..a9c3f04 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c @@ -42,7 +42,7 @@ #include "dpaa_eth.h" #include "dpaa_1588.h" -#ifdef CONFIG_DPAA_ETH_SG_SUPPORT +#ifdef CONFIG_FSL_DPAA_ETH_SG_SUPPORT #define DPA_SGT_MAX_ENTRIES 16 /* maximum number of entries in SG Table */ /* @@ -249,7 +249,7 @@ struct sk_buff *_dpa_cleanup_tx_fd(const struct dpa_priv_s *priv, */ sgt = phys_to_virt(addr + dpa_fd_offset(fd)); -#ifdef CONFIG_FSL_DPA_TS +#ifdef CONFIG_FSL_DPAA_TS if (unlikely(priv->ts_tx_en && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { struct skb_shared_hwtstamps shhwtstamps; @@ -257,7 +257,7 @@ struct sk_buff *_dpa_cleanup_tx_fd(const struct dpa_priv_s *priv, dpa_get_ts(priv, TX, &shhwtstamps, (void *)skbh); skb_tstamp_tx(skb, &shhwtstamps); } -#endif /* CONFIG_FSL_DPA_TS */ +#endif /* CONFIG_FSL_DPAA_TS */ /* sgt[0] is from lowmem, was dma_map_single()-ed */ dma_unmap_single(dpa_bp->dev, sgt[0].addr, @@ -280,7 +280,7 @@ struct sk_buff *_dpa_cleanup_tx_fd(const struct dpa_priv_s *priv, /* Free separately the pages that we allocated on Tx */ free_page((unsigned long)phys_to_virt(addr)); } -#ifdef CONFIG_FSL_DPA_TS +#ifdef CONFIG_FSL_DPAA_TS else { /* get the timestamp for non-SG frames */ if (unlikely(priv->ts_tx_en && @@ -291,7 +291,7 @@ struct sk_buff *_dpa_cleanup_tx_fd(const struct dpa_priv_s *priv, skb_tstamp_tx(skb, &shhwtstamps); } } -#endif /* CONFIG_FSL_DPA_TS */ +#endif /* CONFIG_FSL_DPAA_TS */ return skb; } @@ -318,7 +318,7 @@ static void __hot contig_fd_to_skb(const struct dpa_priv_s *priv, vaddr = phys_to_virt(addr); /* do we need the timestamp for bad frames? */ -#ifdef CONFIG_FSL_DPA_1588 +#ifdef CONFIG_FSL_DPAA_1588 if (priv->tsu && priv->tsu->valid && priv->tsu->hwts_rx_en_ioctl) dpa_ptp_store_rxstamp(priv->net_dev, skb, fd); #endif @@ -327,10 +327,10 @@ static void __hot contig_fd_to_skb(const struct dpa_priv_s *priv, parse_results = (const t_FmPrsResult *)(vaddr + DPA_RX_PRIV_DATA_SIZE); _dpa_process_parse_results(parse_results, fd, skb, use_gro, ©_size); -#ifdef CONFIG_FSL_DPA_TS +#ifdef CONFIG_FSL_DPAA_TS if (priv->ts_rx_en) dpa_get_ts(priv, RX, skb_hwtstamps(skb), vaddr); -#endif /* CONFIG_FSL_DPA_TS */ +#endif /* CONFIG_FSL_DPAA_TS */ tailptr = skb_put(skb, copy_size); @@ -392,10 +392,10 @@ static void __hot sg_fd_to_skb(const struct dpa_priv_s *priv, /* Inspect the parse results before anything else. */ _dpa_process_parse_results(parse_results, fd, skb, use_gro, ©_size); -#ifdef CONFIG_FSL_DPA_TS +#ifdef CONFIG_FSL_DPAA_TS if (priv->ts_rx_en) dpa_get_ts(priv, RX, skb_hwtstamps(skb), vaddr); -#endif /* CONFIG_FSL_DPA_TS */ +#endif /* CONFIG_FSL_DPAA_TS */ /* * Iterate through the SGT entries and add the data buffers as @@ -451,7 +451,7 @@ static void __hot sg_fd_to_skb(const struct dpa_priv_s *priv, break; } -#ifdef CONFIG_FSL_DPA_1588 +#ifdef CONFIG_FSL_DPAA_1588 if (priv->tsu && priv->tsu->valid && priv->tsu->hwts_rx_en_ioctl) dpa_ptp_store_rxstamp(priv->net_dev, skb, fd); #endif @@ -737,16 +737,16 @@ int __hot dpa_tx(struct sk_buff *skb, struct net_device *net_dev) clear_fd(&fd); -#ifdef CONFIG_FSL_DPA_1588 +#ifdef CONFIG_FSL_DPAA_1588 if (priv->tsu && priv->tsu->valid && priv->tsu->hwts_tx_en_ioctl) fd.cmd |= FM_FD_CMD_UPD; #endif -#ifdef CONFIG_FSL_DPA_TS +#ifdef CONFIG_FSL_DPAA_TS if (unlikely(priv->ts_tx_en && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) fd.cmd |= FM_FD_CMD_UPD; skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; -#endif /* CONFIG_FSL_DPA_TS */ +#endif /* CONFIG_FSL_DPAA_TS */ /* * MAX_SKB_FRAGS is larger than our DPA_SGT_MAX_ENTRIES; make sure @@ -823,4 +823,4 @@ enomem: return NETDEV_TX_OK; } -#endif /* CONFIG_DPAA_ETH_SG_SUPPORT */ +#endif /* CONFIG_FSL_DPAA_ETH_SG_SUPPORT */ |