net: qed: update copyright years

[linux-2.6-microblaze.git] / drivers / net / vxlan.c

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 5bb448a..89d85dc 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -857,7 +857,6 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                               u32 nhid, struct netlink_ext_ack *extack)
 {
        struct nexthop *old_nh = rtnl_dereference(fdb->nh);
-       struct nh_group *nhg;
        struct nexthop *nh;
        int err = -EINVAL;
 
@@ -876,13 +875,12 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                        nh = NULL;
                        goto err_inval;
                }
-               if (!nh->is_fdb_nh) {
+               if (!nexthop_is_fdb(nh)) {
                        NL_SET_ERR_MSG(extack, "Nexthop is not a fdb nexthop");
                        goto err_inval;
                }
 
-               nhg = rtnl_dereference(nh->nh_grp);
-               if (!nh->is_group || !nhg->mpath) {
+               if (!nexthop_is_multipath(nh)) {
                        NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
                        goto err_inval;
                }
@@ -890,14 +888,14 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                /* check nexthop group family */
                switch (vxlan->default_dst.remote_ip.sa.sa_family) {
                case AF_INET:
-                       if (!nhg->has_v4) {
+                       if (!nexthop_has_v4(nh)) {
                                err = -EAFNOSUPPORT;
                                NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
                                goto err_inval;
                        }
                        break;
                case AF_INET6:
-                       if (nhg->has_v4) {
+                       if (nexthop_has_v4(nh)) {
                                err = -EAFNOSUPPORT;
                                NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
                                goto err_inval;
@@ -1382,6 +1380,8 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                        struct vxlan_rdst *rd;
 
                        if (rcu_access_pointer(f->nh)) {
+                               if (*idx < cb->args[2])
+                                       goto skip_nh;
                                err = vxlan_fdb_info(skb, vxlan, f,
                                                     NETLINK_CB(cb->skb).portid,
                                                     cb->nlh->nlmsg_seq,
@@ -1389,6 +1389,8 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                                                     NLM_F_MULTI, NULL);
                                if (err < 0)
                                        goto out;
+skip_nh:
+                               *idx += 1;
                                continue;
                        }
 
@@ -4245,10 +4247,8 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
                mod_timer(&vxlan->age_timer, jiffies);
 
        netdev_adjacent_change_commit(dst->remote_dev, lowerdev, dev);
-       if (lowerdev && lowerdev != dst->remote_dev) {
+       if (lowerdev && lowerdev != dst->remote_dev)
                dst->remote_dev = lowerdev;
-               netdev_update_lockdep_key(lowerdev);
-       }
        vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
        return 0;
 }