|
@@ -115,9 +115,7 @@ static DEFINE_PCI_DEVICE_TABLE(qlcnic_pci_tbl) = {
|
|
MODULE_DEVICE_TABLE(pci, qlcnic_pci_tbl);
|
|
MODULE_DEVICE_TABLE(pci, qlcnic_pci_tbl);
|
|
|
|
|
|
|
|
|
|
-inline void
|
|
|
|
-qlcnic_update_cmd_producer(struct qlcnic_adapter *adapter,
|
|
|
|
- struct qlcnic_host_tx_ring *tx_ring)
|
|
|
|
|
|
+inline void qlcnic_update_cmd_producer(struct qlcnic_host_tx_ring *tx_ring)
|
|
{
|
|
{
|
|
writel(tx_ring->producer, tx_ring->crb_cmd_producer);
|
|
writel(tx_ring->producer, tx_ring->crb_cmd_producer);
|
|
}
|
|
}
|
|
@@ -1485,8 +1483,8 @@ qlcnic_reset_context(struct qlcnic_adapter *adapter)
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
static int
|
|
-qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
|
|
|
|
- struct net_device *netdev, u8 pci_using_dac)
|
|
|
|
|
|
+qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
|
|
|
|
+ int pci_using_dac)
|
|
{
|
|
{
|
|
int err;
|
|
int err;
|
|
struct pci_dev *pdev = adapter->pdev;
|
|
struct pci_dev *pdev = adapter->pdev;
|
|
@@ -1506,7 +1504,7 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
|
|
|
|
|
|
if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO)
|
|
if (adapter->capabilities & QLCNIC_FW_CAPABILITY_TSO)
|
|
netdev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6;
|
|
netdev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6;
|
|
- if (pci_using_dac)
|
|
|
|
|
|
+ if (pci_using_dac == 1)
|
|
netdev->hw_features |= NETIF_F_HIGHDMA;
|
|
netdev->hw_features |= NETIF_F_HIGHDMA;
|
|
|
|
|
|
netdev->vlan_features = netdev->hw_features;
|
|
netdev->vlan_features = netdev->hw_features;
|
|
@@ -1530,7 +1528,7 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int qlcnic_set_dma_mask(struct pci_dev *pdev, u8 *pci_using_dac)
|
|
|
|
|
|
+static int qlcnic_set_dma_mask(struct pci_dev *pdev, int *pci_using_dac)
|
|
{
|
|
{
|
|
if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
|
|
if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
|
|
!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))
|
|
!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))
|
|
@@ -1564,9 +1562,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
{
|
|
{
|
|
struct net_device *netdev = NULL;
|
|
struct net_device *netdev = NULL;
|
|
struct qlcnic_adapter *adapter = NULL;
|
|
struct qlcnic_adapter *adapter = NULL;
|
|
- int err;
|
|
|
|
|
|
+ int err, pci_using_dac = -1;
|
|
uint8_t revision_id;
|
|
uint8_t revision_id;
|
|
- uint8_t pci_using_dac;
|
|
|
|
char brd_name[QLCNIC_MAX_BOARD_NAME_LEN];
|
|
char brd_name[QLCNIC_MAX_BOARD_NAME_LEN];
|
|
|
|
|
|
err = pci_enable_device(pdev);
|
|
err = pci_enable_device(pdev);
|
|
@@ -2337,7 +2334,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
|
|
adapter->stats.txbytes += skb->len;
|
|
adapter->stats.txbytes += skb->len;
|
|
adapter->stats.xmitcalled++;
|
|
adapter->stats.xmitcalled++;
|
|
|
|
|
|
- qlcnic_update_cmd_producer(adapter, tx_ring);
|
|
|
|
|
|
+ qlcnic_update_cmd_producer(tx_ring);
|
|
|
|
|
|
return NETDEV_TX_OK;
|
|
return NETDEV_TX_OK;
|
|
|
|
|