mac80211: mesh: remove mesh_id check
authorJohannes Berg <johannes.berg@intel.com>
Tue, 21 Jan 2014 20:04:00 +0000 (21:04 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 4 Feb 2014 20:48:16 +0000 (21:48 +0100)
The mesh_id is an array so can't ever be NULL, it looks
like mesh_id_len check was intended instead. However,
since the previous patch, cfg80211 does the check, so
just remove it here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index e948b382cd4508961c8bd148f2a51684b523ed56..cf961a5f3aa960629a85e488be40412e42210cbb 100644 (file)
@@ -3196,9 +3196,6 @@ int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
        case NL80211_IFTYPE_MESH_POINT:
                ifmsh = &sdata->u.mesh;
 
-               if (!ifmsh->mesh_id)
-                       return -EINVAL;
-
                if (params->chandef.width != sdata->vif.bss_conf.chandef.width)
                        return -EINVAL;