@@ -6608,7 +6608,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6608
6608
static int adap_idx = 1 ;
6609
6609
int s_qpp , qpp , num_seg ;
6610
6610
struct port_info * pi ;
6611
- bool highdma = false;
6612
6611
enum chip_type chip ;
6613
6612
void __iomem * regs ;
6614
6613
int func , chip_ver ;
@@ -6687,14 +6686,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6687
6686
return 0 ;
6688
6687
}
6689
6688
6690
- if (!dma_set_mask_and_coherent (& pdev -> dev , DMA_BIT_MASK (64 ))) {
6691
- highdma = true;
6692
- } else {
6693
- err = dma_set_mask (& pdev -> dev , DMA_BIT_MASK (32 ));
6694
- if (err ) {
6695
- dev_err (& pdev -> dev , "no usable DMA configuration\n" );
6696
- goto out_free_adapter ;
6697
- }
6689
+ err = dma_set_mask_and_coherent (& pdev -> dev , DMA_BIT_MASK (64 ));
6690
+ if (err ) {
6691
+ dev_err (& pdev -> dev , "no usable DMA configuration\n" );
6692
+ goto out_free_adapter ;
6698
6693
}
6699
6694
6700
6695
pci_enable_pcie_error_reporting (pdev );
@@ -6823,7 +6818,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6823
6818
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
6824
6819
NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_GRO |
6825
6820
NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
6826
- NETIF_F_HW_TC | NETIF_F_NTUPLE ;
6821
+ NETIF_F_HW_TC | NETIF_F_NTUPLE | NETIF_F_HIGHDMA ;
6827
6822
6828
6823
if (chip_ver > CHELSIO_T5 ) {
6829
6824
netdev -> hw_enc_features |= NETIF_F_IP_CSUM |
@@ -6841,8 +6836,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
6841
6836
netdev -> udp_tunnel_nic_info = & cxgb_udp_tunnels ;
6842
6837
}
6843
6838
6844
- if (highdma )
6845
- netdev -> hw_features |= NETIF_F_HIGHDMA ;
6846
6839
netdev -> features |= netdev -> hw_features ;
6847
6840
netdev -> vlan_features = netdev -> features & VLAN_FEAT ;
6848
6841
#if IS_ENABLED (CONFIG_CHELSIO_TLS_DEVICE )
0 commit comments