diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-26 20:52:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-26 20:52:30 +0300 |
| commit | 2d65685a4a6ff6ef6bfe42717222db92c04224c2 (patch) | |
| tree | 894aebbf77ce53375e999cd5c6bb34ee5d28bb9f /drivers/net/geneve.c | |
| parent | de0038bfaf53af0e8bc4961b7aacdcb79f43bf08 (diff) | |
| parent | fbe0d451bcea569fc0ed3455511a90646c8a9c81 (diff) | |
| download | linux-2d65685a4a6ff6ef6bfe42717222db92c04224c2.tar.xz | |
Merge branch 'x86/urgent' into x86/cleanups
Refresh the branch for a dependent commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 75266580b586..dec52b763d50 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1615,11 +1615,11 @@ static int geneve_changelink(struct net_device *dev, struct nlattr *tb[], struct netlink_ext_ack *extack) { struct geneve_dev *geneve = netdev_priv(dev); + enum ifla_geneve_df df = geneve->df; struct geneve_sock *gs4, *gs6; struct ip_tunnel_info info; bool metadata; bool use_udp6_rx_checksums; - enum ifla_geneve_df df; bool ttl_inherit; int err; @@ -1649,6 +1649,7 @@ static int geneve_changelink(struct net_device *dev, struct nlattr *tb[], geneve->collect_md = metadata; geneve->use_udp6_rx_checksums = use_udp6_rx_checksums; geneve->ttl_inherit = ttl_inherit; + geneve->df = df; geneve_unquiesce(geneve, gs4, gs6); return 0; |