Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / wireless / libertas / tx.c

diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index f10aa39a6b68e6abe650934ccc4957f653869a98..160cfd8311c08ad5225b418d33e37ce5dd9fd6fa 100644 (file)
--- 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));