Libertas: cfg80211 support

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

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

ERROR: "mesh_handler_def" [drivers/net/wireless/libertas/libertas.ko] undefined!

Caused by a hunk missed by "Libertas: cfg80211 support" when building with CONFIG_WIRELESS_EXT enabled.

Signed-off-by John W. Linville <[email protected]>

---
 drivers/net/wireless/libertas/mesh.c |    3 ---
 drivers/net/wireless/libertas/mesh.h |    5 -----
 2 files changed, 0 insertions(+), 8 deletions(-)

drivers/net/wireless/libertas/mesh.c +0 -3

index 00b36b0..bc5bc13 100644
@@ -370,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);

drivers/net/wireless/libertas/mesh.h +0 -5

index e257330..84ea248 100644
@@ -70,11 +70,6 @@ void lbs_persist_config_init(struct net_device *net);
 void lbs_persist_config_remove(struct net_device *net);
 
 
-/* WEXT handler */
-
-extern struct iw_handler_def mesh_handler_def;
-
-
 /* Ethtool statistics */
 
 struct ethtool_stats;

Address fall-out from patch converting libertas to use cfg80211...

(quoted diff) +3 -0

+drivers/net/wireless/libertas/cfg.c:1844:13: warning: incorrect type in assignment (different base types)
+drivers/net/wireless/libertas/cfg.c:1844:13:    expected unsigned short [unsigned] [usertype] capability
+drivers/net/wireless/libertas/cfg.c:1844:13:    got restricted __le16 [usertype] <noident>

Signed-off-by John W. Linville <[email protected]>

---
 drivers/net/wireless/libertas/cfg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/libertas/cfg.c +1 -1

index 23c1dc6..f36cc97 100644
@@ -1841,7 +1841,7 @@ static int lbs_ibss_start_new(struct lbs_private *priv,
 	if (MRVL_FW_MAJOR_REV(priv->fwrelease) <= 8)
 		cmd.probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
 	/* TODO: mix in WLAN_CAPABILITY_PRIVACY */
-	capability = cpu_to_le16(WLAN_CAPABILITY_IBSS);
+	capability = WLAN_CAPABILITY_IBSS;
 	cmd.capability = cpu_to_le16(capability);
 	lbs_add_rates(cmd.rates);
 

Probably little risk of namespace polution, but good practice... :-)

Signed-off-by John W. Linville <[email protected]>

---
 drivers/net/wireless/libertas/cmdresp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/libertas/cmdresp.c +1 -1

index b4bc103..a0d9482 100644
@@ -103,7 +103,7 @@ static int lbs_ret_reg_access(struct lbs_private *priv,
  *  @param resp    pointer to command response buffer
  *  @return        0; -1
  */
-int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp)
+static int lbs_ret_802_11d_domain_info(struct cmd_ds_command *resp)
 {
 	struct cmd_ds_802_11d_domain_info *domaininfo =
 			&resp->params.domaininforesp;

Quoted 2 lines

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

+drivers/net/wireless/libertas/cfg.c:1844:13: warning: incorrect type in assignment (different base types)
+drivers/net/wireless/libertas/cfg.c:1844:13: expected unsigned short
[unsigned] [usertype] capability
+drivers/net/wireless/libertas/cfg.c:1844:13: got restricted __le16
[usertype] <noident> +drivers/net/wireless/libertas/cmdresp.c:106:5: warning: symbol 'lbs_ret_802_11d_domain_info' was not declared. Should it be static?

I'm guessing this patchset is at fault.

Johannes

Quoted 5 lines

+drivers/net/wireless/libertas/cfg.c:1844:13: warning: incorrect type in assignment (different base types)
+drivers/net/wireless/libertas/cfg.c:1844:13: expected unsigned short
[unsigned] [usertype] capability
+drivers/net/wireless/libertas/cfg.c:1844:13: got restricted __le16

Quoted 4 lines

[usertype] <noident> +drivers/net/wireless/libertas/cmdresp.c:106:5: warning: symbol 'lbs_ret_802_11d_domain_info' was not declared. Should it be static?

These errors did not show up during my compilation. I will now make sure to check with various kernel configs. Any other things should I test?