Re: [PATCH net-next v4 1/2] vxlan: introduce vxlan_rdst_append
From: Cong Wang <hidden>
Date: 2013-06-24 06:03:27
On Sun, 23 Jun 2013 at 16:22 GMT, Mike Rapoport [off-list ref] wrote:
quoted hunk ↗ jump to hunk
to allow remotes list management for both FDB entries and default destinations Signed-off-by: Mike Rapoport <redacted> --- drivers/net/vxlan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 212a256..e5fb6568 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c@@ -386,14 +386,13 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan, return f; } -/* Add/update destinations for multicast */ -static int vxlan_fdb_append(struct vxlan_fdb *f, +static int vxlan_rdst_append(struct list_head *remotes, __be32 ip, __be16 port, __u32 vni, __u32 ifindex)
I think you need to align the above line.
{
struct vxlan_rdst *rd;
/* protected by vxlan->hash_lock */
- list_for_each_entry(rd, &f->remotes, list) {
+ list_for_each_entry(rd, remotes, list) {This patch is based on Stephen's patches which are not yet merged into net-next, right? If so, I think you have to wait. My IPv6 patches are pending because of his patches too.
quoted hunk ↗ jump to hunk
if (rd->remote_ip == ip && rd->remote_port == port && rd->remote_vni == vni &&@@ -409,11 +408,18 @@ static int vxlan_fdb_append(struct vxlan_fdb *f, rd->remote_vni = vni; rd->remote_ifindex = ifindex; - list_add_tail_rcu(&rd->list, &f->remotes); + list_add_tail_rcu(&rd->list, remotes); return 1; } +/* Add/update destinations for multicast */ +static int vxlan_fdb_append(struct vxlan_fdb *f, + __be32 ip, __be16 port, __u32 vni, __u32 ifindex)
You need to align this line too.