linux-next: manual merge of the wireless-next tree with the net-next tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/debug.c between commit 27d7f47756f4 ("net:
wireless: replace strict_strtoul() with kstrtoul()") from the net-next
tree and commit 6e4d291eec82 ("ath9k: Print ANI statistics in debugfs")
from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/wireless/ath/ath9k/debug.c
index 51cc0fa,7852f6e..0000000
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@@ -200,12 -244,15 +244,15 @@@ static ssize_t write_file_ani(struct fi
  		return -EFAULT;
  
  	buf[len] = '\0';
- 	if (kstrtoul(buf, 0, &disable_ani))
 -	if (strict_strtoul(buf, 0, &ani))
++	if (kstrtoul(buf, 0, &ani))
  		return -EINVAL;
  
- 	common->disable_ani = !!disable_ani;
+ 	if (ani < 0 || ani > 1)
+ 		return -EINVAL;
+ 
+ 	common->disable_ani = !ani;
  
- 	if (disable_ani) {
+ 	if (common->disable_ani) {
  		clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
  		ath_stop_ani(sc);
  	} else {

Attachment: pgpz0q3sOe3Fo.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux