@@ -2899,7 +2899,6 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
2899
2899
struct net_device * netdev ;
2900
2900
struct port_info * pi ;
2901
2901
unsigned int pmask ;
2902
- int pci_using_dac ;
2903
2902
int err , pidx ;
2904
2903
2905
2904
/*
@@ -2920,19 +2919,12 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
2920
2919
}
2921
2920
2922
2921
/*
2923
- * Set up our DMA mask: try for 64-bit address masking first and
2924
- * fall back to 32-bit if we can't get 64 bits ...
2922
+ * Set up our DMA mask
2925
2923
*/
2926
2924
err = dma_set_mask_and_coherent (& pdev -> dev , DMA_BIT_MASK (64 ));
2927
- if (err == 0 ) {
2928
- pci_using_dac = 1 ;
2929
- } else {
2930
- err = dma_set_mask (& pdev -> dev , DMA_BIT_MASK (32 ));
2931
- if (err != 0 ) {
2932
- dev_err (& pdev -> dev , "no usable DMA configuration\n" );
2933
- goto err_release_regions ;
2934
- }
2935
- pci_using_dac = 0 ;
2925
+ if (err ) {
2926
+ dev_err (& pdev -> dev , "no usable DMA configuration\n" );
2927
+ goto err_release_regions ;
2936
2928
}
2937
2929
2938
2930
/*
@@ -3078,9 +3070,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
3078
3070
netdev -> hw_features = NETIF_F_SG | TSO_FLAGS | NETIF_F_GRO |
3079
3071
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
3080
3072
NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX ;
3081
- netdev -> features = netdev -> hw_features ;
3082
- if (pci_using_dac )
3083
- netdev -> features |= NETIF_F_HIGHDMA ;
3073
+ netdev -> features = netdev -> hw_features | NETIF_F_HIGHDMA ;
3084
3074
netdev -> vlan_features = netdev -> features & VLAN_FEAT ;
3085
3075
3086
3076
netdev -> priv_flags |= IFF_UNICAST_FLT ;
0 commit comments