| Message ID | 4d27bbb33031ac1489fe6d969edd74d44155136c.1504684488.git.sbrivio@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | i40e: Two trivial fixes for 09f79fd49d94 | expand |
On Wed, 2017-09-06 at 10:11 +0200, Stefano Brivio wrote: > Caller needs to acquire the lock. Called functions will not. > > Fixes: 09f79fd49d94 ("i40e: avoid NVM acquire deadlock during NVM > update") > Signed-off-by: Stefano Brivio <sbrivio@redhat.com> > --- > drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Yes, this fixes the function header comment, not sure if it requires the "Fixes:" tag. If that were the case, wonder why all the other code comment changes do not have this. :-) I do agree it reads better with this change, so I do not have an issue queue this up for Dave's net tree.
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Stefano Brivio > Sent: Wednesday, September 6, 2017 1:12 AM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; > netdev@vger.kernel.org; intel-wired-lan@lists.osuosl.org > Cc: David S . Miller <davem@davemloft.net> > Subject: [Intel-wired-lan] [PATCH net 1/2] i40e: Fix comment about locking > for __i40e_read_nvm_word() > > Caller needs to acquire the lock. Called functions will not. > > Fixes: 09f79fd49d94 ("i40e: avoid NVM acquire deadlock during NVM > update") > Signed-off-by: Stefano Brivio <sbrivio@redhat.com> > --- > drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index 26d7e9fe6220..200779d5c124 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -281,7 +281,7 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset, } /** - * __i40e_read_nvm_word - Reads nvm word, assumes called does the locking + * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking * @hw: pointer to the HW structure * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF) * @data: word read from the Shadow RAM
Caller needs to acquire the lock. Called functions will not. Fixes: 09f79fd49d94 ("i40e: avoid NVM acquire deadlock during NVM update") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> --- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)