* [PATCH] i40e: Fix incorrect pf->flags
@ 2017-05-20 1:01 ` Tushar Dave
0 siblings, 0 replies; 7+ messages in thread
From: Tushar Dave @ 2017-05-20 1:01 UTC (permalink / raw
To: jeffrey.t.kirsher, intel-wired-lan, netdev
Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
hw_disabled_flags in favor of using separate flag bits")' that
mistakenly wipes out pf->flags.
Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index d5c9c9e..6b98d34 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
(pf->hw.aq.api_min_ver > 4))) {
/* Supported in FW API version higher than 1.4 */
pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
- pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+ pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
} else {
- pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+ pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
}
pf->eeprom_version = 0xDEAD;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Intel-wired-lan] [PATCH] i40e: Fix incorrect pf->flags
@ 2017-05-20 1:01 ` Tushar Dave
0 siblings, 0 replies; 7+ messages in thread
From: Tushar Dave @ 2017-05-20 1:01 UTC (permalink / raw
To: intel-wired-lan
Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
hw_disabled_flags in favor of using separate flag bits")' that
mistakenly wipes out pf->flags.
Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index d5c9c9e..6b98d34 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
(pf->hw.aq.api_min_ver > 4))) {
/* Supported in FW API version higher than 1.4 */
pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
- pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+ pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
} else {
- pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
+ pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
}
pf->eeprom_version = 0xDEAD;
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] i40e: Fix incorrect pf->flags
2017-05-20 1:01 ` [Intel-wired-lan] " Tushar Dave
@ 2017-05-25 9:13 ` Jeff Kirsher
-1 siblings, 0 replies; 7+ messages in thread
From: Jeff Kirsher @ 2017-05-25 9:13 UTC (permalink / raw
To: Tushar Dave, intel-wired-lan, netdev
[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]
On Fri, 2017-05-19 at 18:01 -0700, Tushar Dave wrote:
> Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
> hw_disabled_flags in favor of using separate flag bits")' that
> mistakenly wipes out pf->flags.
>
> Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
:-(
Not even close to applying, I even tried to apply by hand but the patch
was not near the same as my branch in my tree. I will forgive this
second instance of a patch generated on different tree/branch, but I
really must insist that you use my tree & branch if you need/want to
make changes to Intel wired LAN driver changes.
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index d5c9c9e..6b98d34 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
> (pf->hw.aq.api_min_ver > 4))) {
> /* Supported in FW API version higher than 1.4 */
> pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> } else {
> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> }
>
> pf->eeprom_version = 0xDEAD;
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-wired-lan] [PATCH] i40e: Fix incorrect pf->flags
@ 2017-05-25 9:13 ` Jeff Kirsher
0 siblings, 0 replies; 7+ messages in thread
From: Jeff Kirsher @ 2017-05-25 9:13 UTC (permalink / raw
To: intel-wired-lan
On Fri, 2017-05-19 at 18:01 -0700, Tushar Dave wrote:
> Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
> hw_disabled_flags in favor of using separate flag bits")' that
> mistakenly wipes out pf->flags.
>
> Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
:-(
Not even close to applying, I even tried to apply by hand but the patch
was not near the same as my branch in my tree. I will forgive this
second instance of a patch generated on different tree/branch, but I
really must insist that you use my tree & branch if you need/want to
make changes to Intel wired LAN driver changes.
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index d5c9c9e..6b98d34 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
> (pf->hw.aq.api_min_ver > 4))) {
> /* Supported in FW API version higher than 1.4 */
> pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> } else {
> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
> }
>
> pf->eeprom_version = 0xDEAD;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170525/5f66082b/attachment.asc>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] i40e: Fix incorrect pf->flags
2017-05-25 9:13 ` [Intel-wired-lan] " Jeff Kirsher
@ 2017-05-25 16:00 ` tndave
-1 siblings, 0 replies; 7+ messages in thread
From: tndave @ 2017-05-25 16:00 UTC (permalink / raw
To: Jeff Kirsher, intel-wired-lan, netdev
On 05/25/2017 02:13 AM, Jeff Kirsher wrote:
> On Fri, 2017-05-19 at 18:01 -0700, Tushar Dave wrote:
>> Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
>> hw_disabled_flags in favor of using separate flag bits")' that
>> mistakenly wipes out pf->flags.
>>
>> Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
>> ---
>> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> :-(
> Not even close to applying, I even tried to apply by hand but the patch
> was not near the same as my branch in my tree. I will forgive this
> second instance of a patch generated on different tree/branch, but I
> really must insist that you use my tree & branch if you need/want to
> make changes to Intel wired LAN driver changes.
Apology Jeff. I used Dave's net tree.
Now onwards, I will use your 'net-queue:dev_queue' for bug fixes and
'next-queue:dev_queue' for developmental changes to Intel Ethernet drivers.
Being this patch a bug fix, I will send v2 based off your git tree
'net-queue' on branch 'dev_queue'. Hope that is okay?
Thanks.
-Tushar
>
>>
>> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
>> b/drivers/net/ethernet/intel/i40e/i40e_main.c
>> index d5c9c9e..6b98d34 100644
>> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
>> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
>> @@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
>> (pf->hw.aq.api_min_ver > 4))) {
>> /* Supported in FW API version higher than 1.4 */
>> pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
>> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> } else {
>> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> }
>>
>> pf->eeprom_version = 0xDEAD;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-wired-lan] [PATCH] i40e: Fix incorrect pf->flags
@ 2017-05-25 16:00 ` tndave
0 siblings, 0 replies; 7+ messages in thread
From: tndave @ 2017-05-25 16:00 UTC (permalink / raw
To: intel-wired-lan
On 05/25/2017 02:13 AM, Jeff Kirsher wrote:
> On Fri, 2017-05-19 at 18:01 -0700, Tushar Dave wrote:
>> Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
>> hw_disabled_flags in favor of using separate flag bits")' that
>> mistakenly wipes out pf->flags.
>>
>> Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
>> ---
>> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> :-(
> Not even close to applying, I even tried to apply by hand but the patch
> was not near the same as my branch in my tree. I will forgive this
> second instance of a patch generated on different tree/branch, but I
> really must insist that you use my tree & branch if you need/want to
> make changes to Intel wired LAN driver changes.
Apology Jeff. I used Dave's net tree.
Now onwards, I will use your 'net-queue:dev_queue' for bug fixes and
'next-queue:dev_queue' for developmental changes to Intel Ethernet drivers.
Being this patch a bug fix, I will send v2 based off your git tree
'net-queue' on branch 'dev_queue'. Hope that is okay?
Thanks.
-Tushar
>
>>
>> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
>> b/drivers/net/ethernet/intel/i40e/i40e_main.c
>> index d5c9c9e..6b98d34 100644
>> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
>> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
>> @@ -8821,9 +8821,9 @@ static int i40e_sw_init(struct i40e_pf *pf)
>> (pf->hw.aq.api_min_ver > 4))) {
>> /* Supported in FW API version higher than 1.4 */
>> pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
>> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> } else {
>> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> + pf->flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
>> }
>>
>> pf->eeprom_version = 0xDEAD;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-wired-lan] [PATCH] i40e: Fix incorrect pf->flags
2017-05-25 16:00 ` [Intel-wired-lan] " tndave
(?)
@ 2017-05-25 18:21 ` Bowers, AndrewX
-1 siblings, 0 replies; 7+ messages in thread
From: Bowers, AndrewX @ 2017-05-25 18:21 UTC (permalink / raw
To: intel-wired-lan
> On 05/25/2017 02:13 AM, Jeff Kirsher wrote:
> > On Fri, 2017-05-19 at 18:01 -0700, Tushar Dave wrote:
> >> Fix bug introduced by 'commit 47994c119a36e ("i40e: remove
> >> hw_disabled_flags in favor of using separate flag bits")' that
> >> mistakenly wipes out pf->flags.
> >>
> >> Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
> >> ---
> >> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-05-25 18:21 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-20 1:01 [PATCH] i40e: Fix incorrect pf->flags Tushar Dave
2017-05-20 1:01 ` [Intel-wired-lan] " Tushar Dave
2017-05-25 9:13 ` Jeff Kirsher
2017-05-25 9:13 ` [Intel-wired-lan] " Jeff Kirsher
2017-05-25 16:00 ` tndave
2017-05-25 16:00 ` [Intel-wired-lan] " tndave
2017-05-25 18:21 ` Bowers, AndrewX
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.