diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-09 23:35:57 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-09 23:35:57 +0100 |
commit | 2573beec56aa28a0e6d4430fb6796d0c76308bcf (patch) | |
tree | 15c902551b78a954d5138304b97a16a4d9968202 /drivers/net/vxlan.c | |
parent | openvswitch: Only set TUNNEL_VXLAN_OPT if VXLAN-GBP metadata is set (diff) | |
parent | tcp: don't include Fast Open option in SYN-ACK on pure SYN-data (diff) | |
download | linux-2573beec56aa28a0e6d4430fb6796d0c76308bcf.tar.xz linux-2573beec56aa28a0e6d4430fb6796d0c76308bcf.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
-rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index e6ed3e66964d..0e57e862c399 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1009,7 +1009,7 @@ static bool vxlan_snoop(struct net_device *dev, if (net_ratelimit()) netdev_info(dev, "%pM migrated from %pIS to %pIS\n", - src_mac, &rdst->remote_ip, &src_ip); + src_mac, &rdst->remote_ip.sa, &src_ip->sa); rdst->remote_ip = *src_ip; f->updated = jiffies; |