projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e716431
)
vxlan: Correct merge error.
author
David S. Miller
<davem@davemloft.net>
Fri, 21 Dec 2018 00:14:22 +0000
(16:14 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 21 Dec 2018 00:14:22 +0000
(16:14 -0800)
When resolving the conflict wrt. the vxlan_fdb_update call
in vxlan_changelink() I made the last argument false instead
of true.
Fix this.
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c
patch
|
blob
|
history
diff --git
a/drivers/net/vxlan.c
b/drivers/net/vxlan.c
index 3d773634a8e240b9877e94a5de14fffd66507e28..5209ee9aac47846367d7f469a7e69d08c030087e 100644
(file)
--- a/
drivers/net/vxlan.c
+++ b/
drivers/net/vxlan.c
@@
-3768,7
+3768,7
@@
static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
dst->remote_vni,
dst->remote_vni,
dst->remote_ifindex,
- NTF_SELF,
fals
e);
+ NTF_SELF,
tru
e);
if (err) {
spin_unlock_bh(&vxlan->hash_lock);
return err;