summaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_rx.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-01-30 23:43:25 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-01-30 23:43:25 +0100
commit747af1e154545566d04f647f86fc3ae512439fab (patch)
tree78ac4b4440022d473b28f235df4e880d3b5adcbe /net/ieee80211/ieee80211_rx.c
parent[PATCH] ieee80211: Add 802.11h information element parsing (diff)
parent[PATCH] PCMCIA=m, HOSTAP_CS=y is not a legal configuration (diff)
downloadlinux-747af1e154545566d04f647f86fc3ae512439fab.tar.xz
linux-747af1e154545566d04f647f86fc3ae512439fab.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r--net/ieee80211/ieee80211_rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index a4ebc22ee712..6c070bc155e7 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1549,7 +1549,7 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
break;
case IEEE80211_STYPE_PROBE_REQ:
- IEEE80211_DEBUG_MGMT("recieved auth (%d)\n",
+ IEEE80211_DEBUG_MGMT("received auth (%d)\n",
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));
@@ -1583,7 +1583,7 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
break;
case IEEE80211_STYPE_AUTH:
- IEEE80211_DEBUG_MGMT("recieved auth (%d)\n",
+ IEEE80211_DEBUG_MGMT("received auth (%d)\n",
WLAN_FC_GET_STYPE(le16_to_cpu
(header->frame_ctl)));