From owner-freebsd-wireless@freebsd.org Sat Sep 17 21:13:50 2016 Return-Path: Delivered-To: freebsd-wireless@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EA3ABDE1FB for ; Sat, 17 Sep 2016 21:13:50 +0000 (UTC) (envelope-from ler@lerctr.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "thebighonker.lerctr.org", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51ECAC8A; Sat, 17 Sep 2016 21:13:50 +0000 (UTC) (envelope-from ler@lerctr.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=lerami; h=Message-ID:References:In-Reply-To:Subject:Cc:To:From:Date: Content-Transfer-Encoding:Content-Type:MIME-Version:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vysN9wEoGqV7ewnFUE65NPN7RO34vgaGD0KVhVQ04yM=; b=SRyQg08QxL9WVejBguQQRhWEpm GnnFixeWu39IeTTqZNNUj3hXdya3/YpKyyUSywQOIVH5ca0QCYIoKb8gDATwzWAIN8oTFtiHgIadI ncXLyE18L60EpZvMee1gWPYgjlGr7hZM80jbZD3rfp+F1VxJ3oSRaHBrlTVF63V836dI=; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]:41541 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.87 (FreeBSD)) (envelope-from ) id 1blMvl-00007f-Nx; Sat, 17 Sep 2016 16:13:49 -0500 Received: from 2001:470:1f0f:42c:d1e3:8cf1:93ec:864c by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Sat, 17 Sep 2016 16:13:49 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Sat, 17 Sep 2016 16:13:49 -0500 From: Larry Rosenman To: Andriy Voskoboinyk Cc: Freebsd wireless , ivadasz@freebsd.org, Adrian Chadd Subject: Re: (IWM) 7260 AC Dual Band - Still No Connect In-Reply-To: References: <20160917024238.GA79497@pita.lerctr.org> <20160917145943.GA6303@pita.lerctr.org> <20160917152147.GA56866@thebighonker.lerctr.org> <20160917153808.GA1425@pita.lerctr.org> <20160917163757.GA1426@pita.lerctr.org> <66a0de815de953b5fa99424dfd624f4f@thebighonker.lerctr.org> <091e5dc8b68ef08086eadb4c8815aeda@thebighonker.lerctr.org> <802576473e12f090260587f62fba0d32@thebighonker.lerctr.org> Message-ID: <068abc6a7c5ec56a6bdc06655510bdb7@thebighonker.lerctr.org> X-Sender: ler@lerctr.org User-Agent: Roundcube Webmail/1.2.0 X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Sep 2016 21:13:50 -0000 On 2016-09-17 13:29, Andriy Voskoboinyk wrote: > Sat, 17 Sep 2016 20:12:59 +0300 було написано Larry Rosenman > : > > 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 # -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 17716 Limpia Crk, Round Rock, TX 78664-7281