[LEDE-DEV] [PATCH 05/25] kernel: generic: make patches apply on top of kernel 4.14

[Hauke Mehrtens]

On 02/18/2018 11:21 PM, Andrey Jr. Melnikov wrote:
> Fix this patch before release. Or drop it if no one has seen this damage and does not complain.

Hi Andrey,

What is the problem with this patch?

Hauke

> 
>> Hauke Mehrtens <hauke at hauke-m.de> wrote:
>>> This modifies the patches in a way that they will apply on top of kernel
>>> 4.14 and also make them build with the x86 target. The configuration
>>> which was copied from kernel 4.9 before is also modified in this patch.
> 
>> [....]
> 
>>> diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> index ad0fb5bdc5..4467975b92 100644
>>> --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
>>> @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>> [...]
> 
>>> -@@ -6009,6 +6054,8 @@ void netdev_upper_dev_unlink(struct net_
>>> -       list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
>>> -               __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
>>> +@@ -6341,6 +6386,8 @@ void netdev_upper_dev_unlink(struct net_
>>> + 
>>> +       __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
>>>   
>>>  +      netdev_update_addr_mask(dev);
>>>  +      netdev_update_addr_mask(dev);
>>>         call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
>>>                                       &changeupper_info.info);
>>>   }
> 
>> Patch broken on rebase. In 4.4 - netdev_update_addr_mask(dev); present three
>> times and called before call_netdevice_notifiers_info(...). Now it called
>> twice in one place.
> 
>> [...]