From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 21 Jan 2014 20:04:00 +0000 (+0100)
Subject: mac80211: mesh: remove mesh_id check
X-Git-Tag: firefly_0821_release~176^2~4167^2~18^2^2~47^2~84
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80e207c32bff0f9e990f4ff629c809bd20c7950a;p=firefly-linux-kernel-4.4.55.git

mac80211: mesh: remove mesh_id check

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>
---

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e948b382cd45..cf961a5f3aa9 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -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;