| Message ID | 1502280278-9970-1-git-send-email-xiangxia.m.yue@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Aug 9, 2017 at 5:04 AM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote: > This patch reverts the commit 6e7bc478c9a0 > ("net: skb_needs_check() accepts CHECKSUM_NONE for tx"), > because we removed the UFO support. > > Cc: Eric Dumazet <edumazet@google.com> > Cc: Willem de Bruijn <willemb@google.com> > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> I would wait until net is merged into net-next. This will cause a conflict. Also, while logically equivalent, it is not a real revert (as in `git revert $SHA1`) of that patch. Aside from those concerns, I agree that the original patch is no longer needed now that UFO is reverted.
Thanks for your work. On Thu, Aug 10, 2017 at 2:30 AM, Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > On Wed, Aug 9, 2017 at 5:04 AM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote: >> This patch reverts the commit 6e7bc478c9a0 >> ("net: skb_needs_check() accepts CHECKSUM_NONE for tx"), >> because we removed the UFO support. >> >> Cc: Eric Dumazet <edumazet@google.com> >> Cc: Willem de Bruijn <willemb@google.com> >> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > > I would wait until net is merged into net-next. This will cause a conflict. > > Also, while logically equivalent, it is not a real revert (as in `git > revert $SHA1`) of that patch. > > Aside from those concerns, I agree that the original patch is no > longer needed now that UFO is reverted.
On Wed, Aug 9, 2017 at 6:02 PM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote: > Thanks for your work. You, too. > On Thu, Aug 10, 2017 at 2:30 AM, Willem de Bruijn > <willemdebruijn.kernel@gmail.com> wrote: >> On Wed, Aug 9, 2017 at 5:04 AM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote: >>> This patch reverts the commit 6e7bc478c9a0 >>> ("net: skb_needs_check() accepts CHECKSUM_NONE for tx"), >>> because we removed the UFO support. >>> >>> Cc: Eric Dumazet <edumazet@google.com> >>> Cc: Willem de Bruijn <willemb@google.com> >>> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> >> >> >> I would wait until net is merged into net-next. This will cause a conflict. >> >> Also, while logically equivalent, it is not a real revert (as in `git >> revert $SHA1`) of that patch. >> >> Aside from those concerns, I agree that the original patch is no >> longer needed now that UFO is reverted. Please do resubmit the revert patch once net has been merged into net-next.
Hi Willem, because we change the CHECKSUM_NONE to CHECKSUM_UNNECESSARY
in skb_needs_check(), I can't revert 6e7bc478c9a0
("net: skb_needs_check() accepts CHECKSUM_NONE for tx"). I change it
directly and resubmit it.
On Fri, Aug 11, 2017 at 1:03 AM, Willem de Bruijn
<willemdebruijn.kernel@gmail.com> wrote:
> On Wed, Aug 9, 2017 at 6:02 PM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote:
>> Thanks for your work.
>
> You, too.
>
>> On Thu, Aug 10, 2017 at 2:30 AM, Willem de Bruijn
>> <willemdebruijn.kernel@gmail.com> wrote:
>>> On Wed, Aug 9, 2017 at 5:04 AM, Tonghao Zhang <xiangxia.m.yue@gmail.com> wrote:
>>>> This patch reverts the commit 6e7bc478c9a0
>>>> ("net: skb_needs_check() accepts CHECKSUM_NONE for tx"),
>>>> because we removed the UFO support.
>>>>
>>>> Cc: Eric Dumazet <edumazet@google.com>
>>>> Cc: Willem de Bruijn <willemb@google.com>
>>>> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>>>
>>>
>>> I would wait until net is merged into net-next. This will cause a conflict.
>>>
>>> Also, while logically equivalent, it is not a real revert (as in `git
>>> revert $SHA1`) of that patch.
>>>
>>> Aside from those concerns, I agree that the original patch is no
>>> longer needed now that UFO is reverted.
>
> Please do resubmit the revert patch once net has been merged into net-next.
diff --git a/net/core/dev.c b/net/core/dev.c index 1d75499add72..1024d3741d12 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2731,8 +2731,7 @@ EXPORT_SYMBOL(skb_mac_gso_segment); static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) { if (tx_path) - return skb->ip_summed != CHECKSUM_PARTIAL && - skb->ip_summed != CHECKSUM_NONE; + return skb->ip_summed != CHECKSUM_PARTIAL; return skb->ip_summed == CHECKSUM_NONE; }
This patch reverts the commit 6e7bc478c9a0 ("net: skb_needs_check() accepts CHECKSUM_NONE for tx"), because we removed the UFO support. Cc: Eric Dumazet <edumazet@google.com> Cc: Willem de Bruijn <willemb@google.com> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)