From: Xin Long <lucien.xin@gmail.com>
To: Sabrina Dubroca <sd@queasysnail.net>
Cc: network dev <netdev@vger.kernel.org>,
Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
William Tu <u9012063@gmail.com>
Subject: Re: [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set
Date: Tue, 10 Apr 2018 21:10:34 +0800 [thread overview]
Message-ID: <CADvbK_c9nOohr_f09r8dLs3a-7iUgn6KqUjCCenKXrhdPo2Rpw@mail.gmail.com> (raw)
In-Reply-To: <a989fb36846d45587455e648ed4e8ff8707bcee2.1523357388.git.sd@queasysnail.net>
On Tue, Apr 10, 2018 at 6:57 PM, Sabrina Dubroca <sd@queasysnail.net> wrote:
> Commit dd9d598c6657 ("ip_gre: add the support for i/o_flags update via
> netlink") added the ability to change o_flags, but missed that the
> GSO/LLTX features are disabled by default, and only enabled some gre
> features are unused. Thus we also need to disable the GSO/LLTX features
> on the device when the TUNNEL_SEQ or TUNNEL_CSUM flags are set.
>
> These two examples should result in the same features being set:
>
> ip link add gre_none type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 0
>
> ip link set gre_none type gre seq
> ip link add gre_seq type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 1 seq
>
> Fixes: dd9d598c6657 ("ip_gre: add the support for i/o_flags update via netlink")
> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
> ---
> net/ipv4/ip_gre.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index a8772a978224..9c169bb2444d 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -781,8 +781,14 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)
> tunnel->encap.type == TUNNEL_ENCAP_NONE) {
> dev->features |= NETIF_F_GSO_SOFTWARE;
> dev->hw_features |= NETIF_F_GSO_SOFTWARE;
> + } else {
> + dev->features &= ~NETIF_F_GSO_SOFTWARE;
> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
> }
> dev->features |= NETIF_F_LLTX;
> + } else {
> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
> + dev->features &= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);
> }
> }
>
> --
> 2.16.2
>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
next prev parent reply other threads:[~2018-04-10 13:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 10:57 [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set Sabrina Dubroca
2018-04-10 13:10 ` Xin Long [this message]
2018-04-10 13:36 ` William Tu
2018-04-10 15:04 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADvbK_c9nOohr_f09r8dLs3a-7iUgn6KqUjCCenKXrhdPo2Rpw@mail.gmail.com \
--to=lucien.xin@gmail.com \
--cc=lorenzo.bianconi@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sd@queasysnail.net \
--cc=u9012063@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).