Commit 4127b8f9 authored Jan 18, 2019 by Wei Yongjun Committed by Alistair Strachan Feb 09, 2019

UPSTREAM: virt_wifi: fix error return code in virt_wifi_newlink()



Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: c7cdba31ed8b ("mac80211-next: rtnetlink wifi simulation device")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit f9d672f1c2ca36b788511bbd773d650c744e109a)
Change-Id: Ia6290ab996afca7b33e1a8e9b8bcfc0ecbe252f4
Signed-off-by: Cody Schuffelen <schuffelen@google.com>

parent c28f73fe

drivers/net/wireless/virt_wifi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -530,8 +530,10 @@ static int virt_wifi_newlink(struct net src_net, struct net_device dev,
		SET_NETDEV_DEV(dev, &priv->lowerdev->dev);
		dev->ieee80211_ptr = kzalloc(sizeof(*dev->ieee80211_ptr), GFP_KERNEL);

		if (!dev->ieee80211_ptr)
		if (!dev->ieee80211_ptr) {
		err = -ENOMEM;
		goto remove_handler;
		}

		dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
		dev->ieee80211_ptr->wiphy = common_wiphy;