scripts/spelling.txt: add "disassocation" pattern and fix typo instances

Fix typos and add the following to the scripts/spelling.txt:

  disassocation||disassociation

Link: http://lkml.kernel.org/r/1481573103-11329-27-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 96f18222950a58848d855f397124b4d2df4a98dc..f922859acf40a5beecbb30d524ddd24b1372a1b7 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -5652,7 +5652,7 @@ static void shim__set_security(struct net_device *dev,
 
 /* As a temporary work around to enable WPA until we figure out why
  * wpa_supplicant toggles the security capability of the driver, which
- * forces a disassocation with force_update...
+ * forces a disassociation with force_update...
  *
  *     if (force_update || !(priv->status & STATUS_ASSOCIATED))*/
        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index c09215de6d538751cb4f5ce3088615824115638e..5ef3c5cc47c5f75e4aee7c727f4ae08e7225c98f 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3974,7 +3974,7 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                return;
        }
 
-       IPW_DEBUG_ASSOC("Disassocation attempt from %pM "
+       IPW_DEBUG_ASSOC("Disassociation attempt from %pM "
                        "on channel %d.\n",
                        priv->assoc_request.bssid,
                        priv->assoc_request.channel);

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c92dc03c852825fd3f92df6bbae0e7e77409c6d4..ead1aa6d003ef97b09847e8175b704da31c341d1 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1948,7 +1948,7 @@ struct cfg80211_deauth_request {
  * struct cfg80211_disassoc_request - Disassociation request data
  *
  * This structure provides information needed to complete IEEE 802.11
- * disassocation.
+ * disassociation.
  *
  * @bss: the BSS to disassociate from
  * @ie: Extra IEs to add to Disassociation frame or %NULL

diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 898658b5639279126448a390529a193ae9adc77b..6b627d850864b2d569050846dc56dc2978ef9abe 100644 (file)
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -364,6 +364,7 @@ differrence||difference
 difinition||definition
 diplay||display
 direectly||directly
+disassocation||disassociation
 disapear||disappear
 disapeared||disappeared
 disappared||disappeared