nl80211: rename NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE

[mirror_ubuntu-bionic-kernel.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index bf5d28da46e66487aeb1f0c320c188e646696175..d9428afd8bf6d324a3f3cfd5d1e4343b97f83433 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1034,26 +1034,25 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
        u8 *new_ie;
        const u8 *old_ie;
 
-       /* first allocate the new vendor information element */
+       /* allocate information elements */
        new_ie = NULL;
-       old_ie = ifmsh->vendor_ie;
+       old_ie = ifmsh->ie;
 
-       ifmsh->vendor_ie_len = setup->vendor_ie_len;
-       if (setup->vendor_ie_len) {
-               new_ie = kmemdup(setup->vendor_ie, setup->vendor_ie_len,
+       if (setup->ie_len) {
+               new_ie = kmemdup(setup->ie, setup->ie_len,
                                GFP_KERNEL);
                if (!new_ie)
                        return -ENOMEM;
        }
+       ifmsh->ie_len = setup->ie_len;
+       ifmsh->ie = new_ie;
+       kfree(old_ie);
 
        /* now copy the rest of the setup parameters */
        ifmsh->mesh_id_len = setup->mesh_id_len;
        memcpy(ifmsh->mesh_id, setup->mesh_id, ifmsh->mesh_id_len);
        ifmsh->mesh_pp_id = setup->path_sel_proto;
        ifmsh->mesh_pm_id = setup->path_metric;
-       ifmsh->vendor_ie = new_ie;
-
-       kfree(old_ie);
 
        return 0;
 }