(IWM) 7260 AC Dual Band - Still No Connect

[Andriy Voskoboinyk]

Sun, 18 Sep 2016 00:13:49 +0300 було написано Larry Rosenman  
<ler at lerctr.org>:

For HEAD there is one more commit (r305470):
svn revert --depth=infinity sys/dev/iwm   # revert previous 'svn merge'
svn merge -c  
-305470,-304891,-304880,-303557,-303418,-303416,-303413,-303327

> On 2016-09-17 13:29, Andriy Voskoboinyk wrote:
>> Sat, 17 Sep 2016 20:12:59 +0300 було написано Larry Rosenman   
>> <ler at lerctr.org>:
>>  Ok, last try:
>> try to apply 'Comment out SF_CFG_CMD + revert changes for MAC_CONTEXT'   
>> patch
>> from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211885 ;
>> in case, if it will not help, try to revert all local changes
>> ( svn revert sys/dev/iwm/* ) + intel 8000 update
>> ( svn merge -c -304891,-304880,-303557,-303418,-303416,-303413,-303327  
>> . )
>>
>
> when I do this on a fresh checkout from head:
> Checked out revision 305904.
> # svn revert sys/dev/iwm/*
> svn: E155007: '/usr/home/ler/sys/dev/iwm/*' is not a working copy
> # cd /usr/src
> # svn revert sys/dev/iwm/*
> # svn merge -c -304891,-304880,-303557,-303418,-303416,-303413,-303327 .
> --- Reverse-merging r304891 into '.':
> U    sys/dev/iwm/if_iwmreg.h
> --- Recording mergeinfo for reverse merge of r304891 into '.':
>   U   .
> --- Reverse-merging r304880 into '.':
> U    sys/dev/iwm/if_iwm.c
> --- Recording mergeinfo for reverse merge of r304880 into '.':
>   U   .
> --- Reverse-merging r303557 into '.':
> G    sys/dev/iwm/if_iwm.c
> --- Recording mergeinfo for reverse merge of r303557 into '.':
>   U   .
> --- Reverse-merging r303418 into '.':
> G    sys/dev/iwm/if_iwm.c
> --- Recording mergeinfo for reverse merge of r303418 into '.':
>   U   .
> --- Reverse-merging r303416 into '.':
> G    sys/dev/iwm/if_iwm.c
> G    sys/dev/iwm/if_iwmreg.h
> --- Recording mergeinfo for reverse merge of r303416 into '.':
>   U   .
> --- Reverse-merging r303413 into '.':
> G    sys/dev/iwm/if_iwm.c
> --- Recording mergeinfo for reverse merge of r303413 into '.':
>   U   .
> --- Reverse-merging r303327 into '.':
> G    sys/dev/iwm/if_iwm.c
> U    sys/dev/iwm/if_iwmvar.h
> U    sys/dev/iwm/if_iwm_util.c
> U    sys/dev/iwm/if_iwm_phy_db.c
> U    sys/dev/iwm/if_iwm_mac_ctxt.c
> C    sys/dev/iwm/if_iwm_scan.c
> U    sys/dev/iwm/if_iwm_pcie_trans.c
> U    sys/dev/iwm/if_iwm_power.c
> C    sys/dev/iwm/if_iwmreg.h
> U    sys/dev/iwm/if_iwm_led.c
> U    sys/dev/iwm/if_iwm_led.h
> U    sys/dev/iwm/if_iwm_phy_ctxt.c
> U    sys/dev/iwm/if_iwm_time_event.c
> U    sys/dev/iwm/if_iwm_scan.h
> U    sys/dev/iwm/if_iwm_util.h
> --- Recording mergeinfo for reverse merge of r303327 into '.':
>   U   .
> Summary of conflicts:
>    Text conflicts: 2
> Conflict discovered in file 'sys/dev/iwm/if_iwm_scan.c'.
> Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
>          (mc) my side of conflict, (tc) their side of conflict,
>          (s) show all options: p
> Conflict discovered in file 'sys/dev/iwm/if_iwmreg.h'.
> Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
>          (mc) my side of conflict, (tc) their side of conflict,
>          (s) show all options: p
> Summary of conflicts:
>    Text conflicts: 2
> #