diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-13 14:02:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-13 14:02:12 -0800 |
| commit | 22ff311af9c7d0eca4e9d276e95c4793a6ecf84f (patch) | |
| tree | 4b8f3d1b2132f4f7ee8341f82cd26b09753366b6 /drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | |
| parent | Merge tag 'ceph-for-5.5-rc2' of git://github.com/ceph/ceph-client (diff) | |
| parent | treewide: Use sizeof_field() macro (diff) | |
| download | linux-dev-22ff311af9c7d0eca4e9d276e95c4793a6ecf84f.tar.xz linux-dev-22ff311af9c7d0eca4e9d276e95c4793a6ecf84f.zip | |
Merge tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull FIELD_SIZEOF conversion from Kees Cook:
"A mostly mechanical treewide conversion from FIELD_SIZEOF() to
sizeof_field(). This avoids the redundancy of having 2 macros
(actually 3) doing the same thing, and consolidates on sizeof_field().
While "field" is not an accurate name, it is the common name used in
the kernel, and doesn't result in any unintended innuendo.
As there are still users of FIELD_SIZEOF() in -next, I will clean up
those during this coming development cycle and send the final old
macro removal patch at that time"
* tag 'sizeof_field-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
treewide: Use sizeof_field() macro
MIPS: OCTEON: Replace SIZEOF_FIELD() macro
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c index be24d42280d8..a3da422ab05b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c @@ -659,7 +659,7 @@ i40e_status i40e_shutdown_lan_hmc(struct i40e_hw *hw) #define I40E_HMC_STORE(_struct, _ele) \ offsetof(struct _struct, _ele), \ - FIELD_SIZEOF(struct _struct, _ele) + sizeof_field(struct _struct, _ele) struct i40e_context_ele { u16 offset; |