f0aff72c2b
The removed patches are all integrated in the upstream version now. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
22 lines
579 B
Diff
22 lines
579 B
Diff
--- a/drivers/net/wireless/marvell/libertas/cfg.c
|
|
+++ b/drivers/net/wireless/marvell/libertas/cfg.c
|
|
@@ -2053,6 +2053,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
|
|
goto err_wiphy_new;
|
|
}
|
|
|
|
+ set_wiphy_dev(wdev->wiphy, dev);
|
|
+
|
|
return wdev;
|
|
|
|
err_wiphy_new:
|
|
--- a/drivers/net/wireless/marvell/libertas/main.c
|
|
+++ b/drivers/net/wireless/marvell/libertas/main.c
|
|
@@ -935,6 +935,7 @@ struct lbs_private *lbs_add_card(void *c
|
|
goto err_adapter;
|
|
}
|
|
|
|
+ dev_net_set(dev, wiphy_net(wdev->wiphy));
|
|
dev->ieee80211_ptr = wdev;
|
|
dev->ml_priv = priv;
|
|
SET_NETDEV_DEV(dev, dmdev);
|