libertas: support mesh for various firmware versions

CMD_MESH_CONFIG command ID and a couple of structure members in TxPD,
RxPD have been changed in firmware version 10.x.y.z and newer.

Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index f10aa39a6b68..160cfd8311c0 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -132,8 +132,12 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         txpd->tx_packet_length = cpu_to_le16(pkt_len);
         txpd->tx_packet_location = cpu_to_le32(sizeof(struct txpd));
 
-        if (dev == priv->mesh_dev)
-                txpd->tx_control |= cpu_to_le32(TxPD_MESH_FRAME);
+        if (dev == priv->mesh_dev) {
+                if (priv->mesh_fw_ver == MESH_FW_OLD)
+                        txpd->tx_control |= cpu_to_le32(TxPD_MESH_FRAME);
+                else if (priv->mesh_fw_ver == MESH_FW_NEW)
+                        txpd->u.bss.bss_num = MESH_IFACE_ID;
+        }
 
         lbs_deb_hex(LBS_DEB_TX, "txpd", (u8 *) &txpd, sizeof(struct txpd));