Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8982053f9961e56e251724e126614e63a7914cbb..1613080a96b9a590f18898a60ce9e5b626582f26 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -812,7 +812,7 @@ static void handle_channel(struct wiphy *wiphy,
        if (r) {
                /*
                 * We will disable all channels that do not match our
-                * recieved regulatory rule unless the hint is coming
+                * received regulatory rule unless the hint is coming
                 * from a Country IE and the Country IE had no information
                 * about a band. The IEEE 802.11 spec allows for an AP
                 * to send only a subset of the regulatory rules allowed,
@@ -841,7 +841,7 @@ static void handle_channel(struct wiphy *wiphy,
            request_wiphy && request_wiphy == wiphy &&
            request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
                /*
-                * This gaurantees the driver's requested regulatory domain
+                * This guarantees the driver's requested regulatory domain
                 * will always be used as a base for further regulatory
                 * settings
                 */