From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ido Schimmel Subject: [PATCH net-next 01/16] vxlan: __vxlan_fdb_delete(): Drop unused argument vid Date: Wed, 21 Nov 2018 08:02:34 +0000 Message-ID: <20181121080141.16676-2-idosch@mellanox.com> References: <20181121080141.16676-1-idosch@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "davem@davemloft.net" , Jiri Pirko , Petr Machata , "roopa@cumulusnetworks.com" , "nikolay@cumulusnetworks.com" , "stephen@networkplumber.org" , "ivecera@redhat.com" , mlxsw , Ido Schimmel To: "netdev@vger.kernel.org" , "bridge@lists.linux-foundation.org" Return-path: Received: from mail-eopbgr20058.outbound.protection.outlook.com ([40.107.2.58]:26007 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728078AbeKUSgO (ORCPT ); Wed, 21 Nov 2018 13:36:14 -0500 In-Reply-To: <20181121080141.16676-1-idosch@mellanox.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: From: Petr Machata This argument is necessary for vxlan_fdb_delete(), the API of which is prescribed by ndo_fdb_del, but __vxlan_fdb_delete() doesn't need it. Therefore drop it. Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- drivers/net/vxlan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index c3e65e78f015..99ab7844476f 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -977,7 +977,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlat= tr *tb[], static int __vxlan_fdb_delete(struct vxlan_dev *vxlan, const unsigned char *addr, union vxlan_addr ip, __be16 port, __be32 src_vni, __be32 vni, - u32 ifindex, u16 vid) + u32 ifindex) { struct vxlan_fdb *f; struct vxlan_rdst *rd =3D NULL; @@ -1024,8 +1024,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct= nlattr *tb[], return err; =20 spin_lock_bh(&vxlan->hash_lock); - err =3D __vxlan_fdb_delete(vxlan, addr, ip, port, src_vni, vni, ifindex, - vid); + err =3D __vxlan_fdb_delete(vxlan, addr, ip, port, src_vni, vni, ifindex); spin_unlock_bh(&vxlan->hash_lock); =20 return err; @@ -3611,7 +3610,7 @@ static int vxlan_changelink(struct net_device *dev, s= truct nlattr *tb[], vxlan->cfg.dst_port, old_dst.remote_vni, old_dst.remote_vni, - old_dst.remote_ifindex, 0); + old_dst.remote_ifindex); =20 if (!vxlan_addr_any(&dst->remote_ip)) { err =3D vxlan_fdb_create(vxlan, all_zeros_mac, --=20 2.19.1