Skip to content

Fixed build on 6.3 kernels. #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peci1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed build on 6.3 kernels. #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions aq_ring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,11 @@ unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)
/* This data should mimic aq_ethtool_queue_rx_stat_names structure */
do {
count = 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
start = u64_stats_fetch_begin(&self->stats.rx.syncp);
#else
start = u64_stats_fetch_begin_irq(&self->stats.rx.syncp);
#endif
data[count] = self->stats.rx.packets;
data[++count] = self->stats.rx.jumbo_packets;
data[++count] = self->stats.rx.lro_packets;
Expand All @@ -620,17 +624,29 @@ unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)
data[++count] = self->stats.rx.irqs;
data[++count] = self->sw_head;
data[++count] = self->sw_tail;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
} while (u64_stats_fetch_retry(&self->stats.rx.syncp, start));
#else
} while (u64_stats_fetch_retry_irq(&self->stats.rx.syncp, start));
#endif
} else {
/* This data should mimic aq_ethtool_queue_tx_stat_names structure */
do {
count = 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
start = u64_stats_fetch_begin(&self->stats.tx.syncp);
#else
start = u64_stats_fetch_begin_irq(&self->stats.tx.syncp);
#endif
data[count] = self->stats.tx.packets;
data[++count] = self->stats.tx.queue_restarts;
data[++count] = self->sw_head;
data[++count] = self->sw_tail;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
} while (u64_stats_fetch_retry(&self->stats.tx.syncp, start));
#else
} while (u64_stats_fetch_retry_irq(&self->stats.tx.syncp, start));
#endif
}

return ++count;
Expand Down