diff options
| author | David S. Miller <davem@davemloft.net> | 2022-05-18 14:59:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-18 14:59:36 +0300 |
| commit | 680b892685ea7043addb5819ddec9147d4263195 (patch) | |
| tree | db2731a096d92e1250fef32134534be8ea747be5 /drivers/net/ethernet/intel/ice/ice_txrx.h | |
| parent | 089403a3f7d6132e6b8c699510ff66ae29149975 (diff) | |
| parent | bf13502ed5f941b0777b3fd1e24dac5d93f3886c (diff) | |
| download | linux-680b892685ea7043addb5819ddec9147d4263195.tar.xz | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2022-05-17
This series contains updates to ice driver only.
Arkadiusz prevents writing of timestamps when rings are being
configured to resolve null pointer dereference.
Paul changes a delayed call to baseline statistics to occur immediately
which was causing misreporting of statistics due to the delay.
Michal fixes incorrect restoration of interrupt moderation settings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_txrx.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_txrx.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h index cead3eb149bd..ffb3f6a589da 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.h +++ b/drivers/net/ethernet/intel/ice/ice_txrx.h @@ -384,9 +384,14 @@ struct ice_ring_container { /* this matches the maximum number of ITR bits, but in usec * values, so it is shifted left one bit (bit zero is ignored) */ - u16 itr_setting:13; - u16 itr_reserved:2; - u16 itr_mode:1; + union { + struct { + u16 itr_setting:13; + u16 itr_reserved:2; + u16 itr_mode:1; + }; + u16 itr_settings; + }; enum ice_container_type type; }; |