diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-09-06 10:17:35 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2025-09-06 10:17:35 +0200 |
| commit | d035b4baebfc5112b128b66cafd45d2522a9c8f1 (patch) | |
| tree | fc96e96e81597068c9a869c679d18a1a44394164 /drivers/net/ethernet/intel/ice/ice_adapter.h | |
| parent | Linux 6.17-rc3 (diff) | |
| parent | i2c: rtl9300: remove broken SMBus Quick operation support (diff) | |
| download | linux-d035b4baebfc5112b128b66cafd45d2522a9c8f1.tar.gz linux-d035b4baebfc5112b128b66cafd45d2522a9c8f1.zip | |
Merge tag 'i2c-host-fixes-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
i2c-host-fixes for v6.17-rc5
- i801: fix device IDs
- in rtl9300:
- fix channel number check in probe
- check data length boundaries in xfer
- drop unsupported SMBus quick operation
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_adapter.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_adapter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.h b/drivers/net/ethernet/intel/ice/ice_adapter.h index db66d03c9f96..e95266c7f20b 100644 --- a/drivers/net/ethernet/intel/ice/ice_adapter.h +++ b/drivers/net/ethernet/intel/ice/ice_adapter.h @@ -33,7 +33,7 @@ struct ice_port_list { * @txq_ctx_lock: Spinlock protecting access to the GLCOMM_QTX_CNTX_CTL register * @ctrl_pf: Control PF of the adapter * @ports: Ports list - * @device_serial_number: DSN cached for collision detection on 32bit systems + * @index: 64-bit index cached for collision detection on 32bit systems */ struct ice_adapter { refcount_t refcount; @@ -44,7 +44,7 @@ struct ice_adapter { struct ice_pf *ctrl_pf; struct ice_port_list ports; - u64 device_serial_number; + u64 index; }; struct ice_adapter *ice_adapter_get(struct pci_dev *pdev); |