Libertas: cfg80211 support

Holger Schurig's patch (https://patchwork.kernel.org/patch/64286/)
is rebased to latest wireless-testing tree.

(Includes patches from me originally posted as "libertas: fix build
error due to undefined symbol" and "libertas: unmangle capability
value". -- JWL)

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Tested-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index e385af1f4583..bc5bc1384c35 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -5,6 +5,7 @@
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
 #include <linux/kfifo.h>
+#include <net/cfg80211.h>
 
 #include "mesh.h"
 #include "decl.h"
@@ -314,7 +315,7 @@ static int lbs_mesh_dev_open(struct net_device *dev)
 
         spin_lock_irq(&priv->driver_lock);
 
-        if (priv->monitormode) {
+        if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -369,9 +370,6 @@ int lbs_add_mesh(struct lbs_private *priv)
 
         SET_NETDEV_DEV(priv->mesh_dev, priv->dev->dev.parent);
 
-#ifdef  WIRELESS_EXT
-        mesh_dev->wireless_handlers = &mesh_handler_def;
-#endif
         mesh_dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
         /* Register virtual mesh interface */
         ret = register_netdev(mesh_dev);