Merge branch 'libertas-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

7 files changed, 35 insertions, 18 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index ee82413b426d..f67efa0815fe 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -200,6 +200,14 @@ static int update_channel(wlan_private * priv)
                                     cmd_option_waitforrsp, 0, NULL);
 }
 
+void libertas_sync_channel(struct work_struct *work)
+{
+        wlan_private *priv = container_of(work, wlan_private, sync_channel);
+
+        if (update_channel(priv) != 0)
+                lbs_pr_info("Channel synchronization failed.");
+}
+
 static int assoc_helper_channel(wlan_private *priv,
                                 struct assoc_request * assoc_req)
 {
@@ -403,6 +411,11 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
                 return 1;
         }
 
+        if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags)) {
+                lbs_deb_assoc("Deauthenticating due to channel switch.\n");
+                return 1;
+        }
+
         /* FIXME: deal with 'auto' mode somehow */
         if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
                 if (assoc_req->mode != IW_MODE_INFRA)
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
index b5eddf8d3b39..5e9c31f0932b 100644
--- a/drivers/net/wireless/libertas/assoc.h
+++ b/drivers/net/wireless/libertas/assoc.h
@@ -9,6 +9,8 @@ void libertas_association_worker(struct work_struct *work);
 
 struct assoc_request * wlan_get_association_request(wlan_adapter *adapter);
 
+void libertas_sync_channel(struct work_struct *work);
+
 #define ASSOC_DELAY (HZ / 2)
 static inline void wlan_postpone_association_work(wlan_private *priv)
 {
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index ebedd630d72e..0c3b9a583d83 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -987,6 +987,7 @@ int libertas_process_event(wlan_private * priv)
                         netif_carrier_on(priv->mesh_dev) ;
                 }
                 adapter->mode = IW_MODE_ADHOC ;
+                schedule_work(&priv->sync_channel);
                 break;
 
         default:
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index d6c340aef681..785192b884bc 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -150,6 +150,7 @@ struct _wlan_private {
 
         struct delayed_work assoc_work;
         struct workqueue_struct *assoc_thread;
+        struct work_struct sync_channel;
 
         /** Hardware access */
         int (*hw_register_dev) (wlan_private * priv);
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index cedf1dbab050..7509cc10af3c 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -310,8 +310,8 @@ enum cmd_mesh_access_opts {
         cmd_act_mesh_get_ttl = 1,
         cmd_act_mesh_set_ttl,
         cmd_act_mesh_get_stats,
-        cmd_act_mesh_get_mpp,
-        cmd_act_mesh_set_mpp,
+        cmd_act_mesh_get_anycast,
+        cmd_act_mesh_set_anycast,
 };
 
 /** Card Event definition */
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index ec9be0c51c69..623ab4b16973 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -178,45 +178,45 @@ u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] =
  */
 
 /**
- * @brief Get function for sysfs attribute libertas_mpp
+ * @brief Get function for sysfs attribute anycast_mask
  */
-static ssize_t libertas_mpp_get(struct device * dev,
+static ssize_t libertas_anycast_get(struct device * dev,
                 struct device_attribute *attr, char * buf) {
         struct cmd_ds_mesh_access mesh_access;
 
         memset(&mesh_access, 0, sizeof(mesh_access));
         libertas_prepare_and_send_command(to_net_dev(dev)->priv,
                         cmd_mesh_access,
-                        cmd_act_mesh_get_mpp,
+                        cmd_act_mesh_get_anycast,
                         cmd_option_waitforrsp, 0, (void *)&mesh_access);
 
-        return snprintf(buf, 3, "%d\n", le32_to_cpu(mesh_access.data[0]));
+        return snprintf(buf, 12, "0x%X\n", le32_to_cpu(mesh_access.data[0]));
 }
 
 /**
- * @brief Set function for sysfs attribute libertas_mpp
+ * @brief Set function for sysfs attribute anycast_mask
  */
-static ssize_t libertas_mpp_set(struct device * dev,
+static ssize_t libertas_anycast_set(struct device * dev,
                 struct device_attribute *attr, const char * buf, size_t count) {
         struct cmd_ds_mesh_access mesh_access;
         uint32_t datum;
 
         memset(&mesh_access, 0, sizeof(mesh_access));
-        sscanf(buf, "%d", &datum);
+        sscanf(buf, "%x", &datum);
         mesh_access.data[0] = cpu_to_le32(datum);
 
         libertas_prepare_and_send_command((to_net_dev(dev))->priv,
                         cmd_mesh_access,
-                        cmd_act_mesh_set_mpp,
+                        cmd_act_mesh_set_anycast,
                         cmd_option_waitforrsp, 0, (void *)&mesh_access);
         return strlen(buf);
 }
 
 /**
- * libertas_mpp attribute to be exported per mshX interface
- * through sysfs (/sys/class/net/mshX/libertas-mpp)
+ * anycast_mask attribute to be exported per mshX interface
+ * through sysfs (/sys/class/net/mshX/anycast_mask)
  */
-static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get, libertas_mpp_set );
+static DEVICE_ATTR(anycast_mask, 0644, libertas_anycast_get, libertas_anycast_set);
 
 /**
  *  @brief Check if the device can be open and wait if necessary.
@@ -847,6 +847,7 @@ int libertas_activate_card(wlan_private *priv, char *fw_name)
         priv->assoc_thread =
                 create_singlethread_workqueue("libertas_assoc");
         INIT_DELAYED_WORK(&priv->assoc_work, libertas_association_worker);
+        INIT_WORK(&priv->sync_channel, libertas_sync_channel);
 
         /*
          * Register the device. Fillup the private data structure with
@@ -938,7 +939,7 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
                 goto err_free;
         }
 
-        ret = device_create_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+        ret = device_create_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
         if (ret)
                 goto err_unregister;
 
@@ -1048,7 +1049,7 @@ void libertas_remove_mesh(wlan_private *priv)
         netif_stop_queue(mesh_dev);
         netif_carrier_off(priv->mesh_dev);
 
-        device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+        device_remove_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
         unregister_netdev(mesh_dev);
 
         priv->mesh_dev = NULL ;
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5d70a7625150..88d9d2d787d5 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -141,10 +141,9 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
         lbs_deb_rx("skb->data %p\n", skb->data);
 
         if (priv->mesh_dev && IS_MESH_FRAME(skb))
-                skb->dev = priv->mesh_dev;
+                skb->protocol = eth_type_trans(skb, priv->mesh_dev);
         else
-                skb->dev = priv->dev;
-        skb->protocol = eth_type_trans(skb, priv->dev);
+                skb->protocol = eth_type_trans(skb, priv->dev);
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
         netif_rx(skb);