On 14/03/2019 10:50, Simon Horman wrote:
> On Tue, Mar 12, 2019 at 04:05:16PM +0100, Simon Horman wrote:
>> On Mon, Mar 11, 2019 at 03:25:09PM +0000, John Hurley wrote:
>>> On Mon, Mar 11, 2019 at 2:34 PM Roi Dayan <[email protected]> wrote:
>>>>
>>>> It could be a port added to ovs bridge already has ingress qdisc
>>>> which will make the block probe fail.
>>>> The probes should start clean and ingress is being added later
>>>> so just remove ingress in case it exists.
>>>>
>>>> Signed-off-by: Roi Dayan <[email protected]>
>>>
>>> Acked-by: John Hurley <[email protected]>
>>
>> Thanks,
>>
>> I have applied this to master and branch-2.11.
>>
>> It also appears to apply cleanly to branch-2.10, but currently travis-ci
>> fails on that branch so I'm seeing if I can get to the bottom of that.
>
> branch-2.10 passes travis-ci testing once again and
> I have gone ahead and applied this patch to that branch.
>
>> If the patch is also appropriate for older branches please consider
>> supplying a backport.
>
> Any comment on this?
I replied on this. did u get my reply?
I don't think older branches need this.
>
>>
>>>
>>>> ---
>>>> lib/netdev-tc-offloads.c | 3 +++
>>>> 1 file changed, 3 insertions(+)
>>>>
>>>> diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c
>>>> index da43549f2f22..b33a79bb14a2 100644
>>>> --- a/lib/netdev-tc-offloads.c
>>>> +++ b/lib/netdev-tc-offloads.c
>>>> @@ -1527,6 +1527,9 @@ netdev_tc_init_flow_api(struct netdev *netdev)
>>>> return -ifindex;
>>>> }
>>>>
>>>> + /* make sure there is no ingress qdisc */
>>>> + tc_add_del_ingress_qdisc(ifindex, false, 0);
>>>> +
>>>> if (ovsthread_once_start(&block_once)) {
>>>> probe_tc_block_support(ifindex);
>>>> ovsthread_once_done(&block_once);
>>>> --
>>>> 2.7.0
>>>>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev