diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-01-30 17:43:25 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-01-30 17:43:25 -0500 |
| commit | 747af1e154545566d04f647f86fc3ae512439fab (patch) | |
| tree | 78ac4b4440022d473b28f235df4e880d3b5adcbe /net | |
| parent | d1b46b0fba8c1049135ee5d60910b04463dccc95 (diff) | |
| parent | ae7ec20582de0867abda66ad06d468ce12b231f2 (diff) | |
| download | linux-3.10-747af1e154545566d04f647f86fc3ae512439fab.tar.gz linux-3.10-747af1e154545566d04f647f86fc3ae512439fab.tar.bz2 linux-3.10-747af1e154545566d04f647f86fc3ae512439fab.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index a4ebc22ee71..6c070bc155e 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))); |