---

yaml --- r: 215096 b: refs/heads/master c: 72645ef h: refs/heads/master v: v3
git-mirror · Oct 6, 2010 · 47b426d · 47b426d
1 parent 9524bd4
commit 47b426d
Show file tree

Hide file tree

Showing 62 changed files with 1,113 additions and 806 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7573eac762af253e0b61b60cce34ab80f2dd45c7
+refs/heads/master: 72645eff4b2ad6cf2b016b54f9d6817cca0a621d
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -563,3 +563,13 @@ Why:	superseded by acpi_sleep=nonvs
 Who:	Rafael J. Wysocki <rjw@sisk.pl>
 
 ----------------------------
+
+What:	iwlwifi disable_hw_scan module parameters
+When:	2.6.40
+Why:	Hareware scan is the prefer method for iwlwifi devices for
+	scanning operation. Remove software scan support for all the
+	iwlwifi devices.
+
+Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+----------------------------
diff --git a/trunk/drivers/net/wireless/ath/ath.h b/trunk/drivers/net/wireless/ath/ath.h
@@ -102,12 +102,14 @@ enum ath_cipher {
  * @read: Register read
  * @write: Register write
  * @enable_write_buffer: Enable multiple register writes
- * @write_flush: flush buffered register writes and disable buffering
+ * @disable_write_buffer: Disable multiple register writes
+ * @write_flush: Flush buffered register writes
  */
 struct ath_ops {
 	unsigned int (*read)(void *, u32 reg_offset);
 	void (*write)(void *, u32 val, u32 reg_offset);
 	void (*enable_write_buffer)(void *);
+	void (*disable_write_buffer)(void *);
 	void (*write_flush) (void *);
 };