072937888e
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait:
Provide infrastructure to deal with nested blocking") from 3.19, causing
the following error on load:
[ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel)
Fix this by guarding it with a check for 3.18.11 or earlier instead of
3.19.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45710
11 lines
419 B
Diff
11 lines
419 B
Diff
--- a/drivers/net/wireless/libertas/cfg.c
|
|
+++ b/drivers/net/wireless/libertas/cfg.c
|
|
@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
|
|
wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
|
|
wdev->wiphy->reg_notifier = lbs_reg_notifier;
|
|
|
|
+ memcpy(wdev->wiphy->perm_addr, priv->current_addr, ETH_ALEN);
|
|
+
|
|
ret = wiphy_register(wdev->wiphy);
|
|
if (ret < 0)
|
|
pr_err("cannot register wiphy device\n");
|