[PATCH] libertas: updated mesh commands for 5.220.9.p11

Updated commands fwt_add and fwt_list, bt_list.
New commands: bt_get_invert, bt_set_invert, to invert the blinding table,
i.e., receive only frames from nodes listed in the BT.

This patch needs/is needed for firmware 5.220.9.p11.

Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 76 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/ioctl.c b/drivers/net/wireless/libertas/ioctl.c
index 3f95e97a309e..5a5863239067 100644
--- a/drivers/net/wireless/libertas/ioctl.c
+++ b/drivers/net/wireless/libertas/ioctl.c
@@ -241,7 +241,7 @@ static int wlan_bt_list_ioctl(wlan_private * priv, struct ifreq *req)
         if (ret == 0) {
                 addr1 = param.addr1addr2;
 
-                pos = sprintf(pbuf, "ignoring traffic from ");
+                pos = sprintf(pbuf, "BT includes node ");
                 pbuf += pos;
                 pos = eth_addr2str(addr1, pbuf);
                 pbuf += pos;
@@ -258,6 +258,64 @@ static int wlan_bt_list_ioctl(wlan_private * priv, struct ifreq *req)
         }
 
         lbs_deb_leave(LBS_DEB_IOCTL);
+        return 0 ;
+}
+
+/**
+ *  @brief          Sets inverted state of blacklist (non-zero if inverted)
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_set_invert_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int ret;
+        struct iwreq *wrq = (struct iwreq *)req;
+        union {
+                int id;
+                char addr1addr2[2 * ETH_ALEN];
+        } param;
+
+        lbs_deb_enter(LBS_DEB_IOCTL);
+
+        param.id = SUBCMD_DATA(wrq) ;
+        ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
+                                    cmd_act_bt_access_set_invert,
+                                    cmd_option_waitforrsp, 0,
+                                    (char *)&param);
+        if (ret != 0)
+                return -EFAULT;
+        lbs_deb_leave(LBS_DEB_IOCTL);
+        return 0;
+}
+
+/**
+ *  @brief          Gets inverted state of blacklist (non-zero if inverted)
+ *  @param priv     A pointer to wlan_private structure
+ *  @param req      A pointer to ifreq structure
+ *  @return         0 --success, otherwise fail
+ */
+static int wlan_bt_get_invert_ioctl(wlan_private * priv, struct ifreq *req)
+{
+        int ret;
+        union {
+                int id;
+                char addr1addr2[2 * ETH_ALEN];
+        } param;
+
+        lbs_deb_enter(LBS_DEB_IOCTL);
+
+        ret = libertas_prepare_and_send_command(priv, cmd_bt_access,
+                                    cmd_act_bt_access_get_invert,
+                                    cmd_option_waitforrsp, 0,
+                                    (char *)&param);
+
+        if (ret == 0)
+                req->ifr_data = (char *)(le32_to_cpu(param.id));
+        else
+                return -EFAULT;
+
+        lbs_deb_leave(LBS_DEB_IOCTL);
         return 0;
 }
 
@@ -314,6 +372,11 @@ static int wlan_fwt_add_ioctl(wlan_private * priv, struct ifreq *req)
                 fwt_access.dir = FWT_DEFAULT_DIR;
 
         if ((ptr = next_param(ptr)))
+                fwt_access.rate = (u8) simple_strtoul(ptr, &ptr, 10);
+        else
+                fwt_access.rate = FWT_DEFAULT_RATE;
+
+        if ((ptr = next_param(ptr)))
                 fwt_access.ssn =
                         cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
         else
@@ -441,15 +504,18 @@ static void print_route(struct cmd_ds_fwt_access fwt_access, char *buf)
         buf += eth_addr2str(fwt_access.da, buf);
         buf += sprintf(buf, " ");
         buf += eth_addr2str(fwt_access.ra, buf);
+        buf += sprintf(buf, " %u", fwt_access.valid);
         buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.metric));
         buf += sprintf(buf, " %u", fwt_access.dir);
+        buf += sprintf(buf, " %u", fwt_access.rate);
         buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.ssn));
         buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.dsn));
         buf += sprintf(buf, " %u", fwt_access.hopcount);
         buf += sprintf(buf, " %u", fwt_access.ttl);
         buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.expiration));
         buf += sprintf(buf, " %u", fwt_access.sleepmode);
-        buf += sprintf(buf, " %u", le32_to_cpu(fwt_access.snr));
+        buf += sprintf(buf, " %u ", le32_to_cpu(fwt_access.snr));
+        buf += eth_addr2str(fwt_access.prec, buf);
 }
 
 /**
@@ -866,6 +932,10 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                         ret = wlan_mesh_set_ttl_ioctl(priv, idata);
                         break;
 
+                case WLAN_SUBCMD_BT_SET_INVERT:
+                        ret = wlan_bt_set_invert_ioctl(priv, req);
+                        break ;
+
                 default:
                         ret = -EOPNOTSUPP;
                         break;
@@ -923,6 +993,10 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                         ret = wlan_mesh_get_ttl_ioctl(priv, req);
                         break;
 
+                case WLAN_SUBCMD_BT_GET_INVERT:
+                        ret = wlan_bt_get_invert_ioctl(priv, req);
+                        break ;
+
                 default:
                         ret = -EOPNOTSUPP;