Commit 3fd3b03b authored by David S. Miller's avatar David S. Miller

Merge branch 'ena-fixes'

Netanel Belgazal says:

====================
ENA ethernet driver bug fixes

Some fixes for ENA ethernet driver
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 28e33f9d a59df396
...@@ -742,8 +742,8 @@ static void ena_get_channels(struct net_device *netdev, ...@@ -742,8 +742,8 @@ static void ena_get_channels(struct net_device *netdev,
{ {
struct ena_adapter *adapter = netdev_priv(netdev); struct ena_adapter *adapter = netdev_priv(netdev);
channels->max_rx = ENA_MAX_NUM_IO_QUEUES; channels->max_rx = adapter->num_queues;
channels->max_tx = ENA_MAX_NUM_IO_QUEUES; channels->max_tx = adapter->num_queues;
channels->max_other = 0; channels->max_other = 0;
channels->max_combined = 0; channels->max_combined = 0;
channels->rx_count = adapter->num_queues; channels->rx_count = adapter->num_queues;
......
...@@ -966,7 +966,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring, ...@@ -966,7 +966,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,
u64_stats_update_begin(&rx_ring->syncp); u64_stats_update_begin(&rx_ring->syncp);
rx_ring->rx_stats.bad_csum++; rx_ring->rx_stats.bad_csum++;
u64_stats_update_end(&rx_ring->syncp); u64_stats_update_end(&rx_ring->syncp);
netif_err(rx_ring->adapter, rx_err, rx_ring->netdev, netif_dbg(rx_ring->adapter, rx_err, rx_ring->netdev,
"RX IPv4 header checksum error\n"); "RX IPv4 header checksum error\n");
return; return;
} }
...@@ -979,7 +979,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring, ...@@ -979,7 +979,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,
u64_stats_update_begin(&rx_ring->syncp); u64_stats_update_begin(&rx_ring->syncp);
rx_ring->rx_stats.bad_csum++; rx_ring->rx_stats.bad_csum++;
u64_stats_update_end(&rx_ring->syncp); u64_stats_update_end(&rx_ring->syncp);
netif_err(rx_ring->adapter, rx_err, rx_ring->netdev, netif_dbg(rx_ring->adapter, rx_err, rx_ring->netdev,
"RX L4 checksum error\n"); "RX L4 checksum error\n");
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
return; return;
...@@ -3064,7 +3064,8 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev) ...@@ -3064,7 +3064,8 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
if (ena_dev->mem_bar) if (ena_dev->mem_bar)
devm_iounmap(&pdev->dev, ena_dev->mem_bar); devm_iounmap(&pdev->dev, ena_dev->mem_bar);
devm_iounmap(&pdev->dev, ena_dev->reg_bar); if (ena_dev->reg_bar)
devm_iounmap(&pdev->dev, ena_dev->reg_bar);
release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK; release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK;
pci_release_selected_regions(pdev, release_bars); pci_release_selected_regions(pdev, release_bars);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment