Merge branch 'for-linus' of git://www.jni.nu/cris

[~andy/linux] / Documentation / networking / mac80211_hwsim / README

diff --git a/Documentation/networking/mac80211_hwsim/README b/Documentation/networking/mac80211_hwsim/README
index 2f6e90fcb5a79e91f33c753027ed998640954e58..2ff8ccb8dc3715dd343c5229b8c6ded98dde7d03 100644 (file)
--- a/Documentation/networking/mac80211_hwsim/README
+++ b/Documentation/networking/mac80211_hwsim/README
@@ -9,13 +9,12 @@ published by the Free Software Foundation.
 Introduction
 
 mac80211_hwsim is a Linux kernel module that can be used to simulate
-arbitrary number of IEEE 802.11 radios for mac80211 on a single
-device. It can be used to test most of the mac80211 functionality and
-user space tools (e.g., hostapd and wpa_supplicant) in a way that
-matches very closely with the normal case of using real WLAN
-hardware. From the mac80211 view point, mac80211_hwsim is yet another
-hardware driver, i.e., no changes to mac80211 are needed to use this
-testing tool.
+arbitrary number of IEEE 802.11 radios for mac80211. It can be used to
+test most of the mac80211 functionality and user space tools (e.g.,
+hostapd and wpa_supplicant) in a way that matches very closely with
+the normal case of using real WLAN hardware. From the mac80211 view
+point, mac80211_hwsim is yet another hardware driver, i.e., no changes
+to mac80211 are needed to use this testing tool.
 
 The main goal for mac80211_hwsim is to make it easier for developers
 to test their code and work with new features to mac80211, hostapd,
@@ -26,7 +25,7 @@ since all radio operation is simulated, any channel can be used in
 tests regardless of regulatory rules.
 
 mac80211_hwsim kernel module has a parameter 'radios' that can be used
-to select how many radios are simulates (default 2). This allows
+to select how many radios are simulated (default 2). This allows
 configuration of both very simply setups (e.g., just a single access
 point and a station) or large scale tests (multiple access points with
 hundreds of stations).