From owner-freebsd-wireless@freebsd.org Sat Sep 17 21:18:31 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 BF88EBDE28C for ; Sat, 17 Sep 2016 21:18:31 +0000 (UTC) (envelope-from s3erios@gmail.com) Received: from mail-lf0-x22d.google.com (mail-lf0-x22d.google.com [IPv6:2a00:1450:4010:c07::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3BAAFDB5 for ; Sat, 17 Sep 2016 21:18:31 +0000 (UTC) (envelope-from s3erios@gmail.com) Received: by mail-lf0-x22d.google.com with SMTP id h127so87361603lfh.0 for ; Sat, 17 Sep 2016 14:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:subject:references:date:mime-version :content-transfer-encoding:from:message-id:in-reply-to:user-agent; bh=1GiJUeGeUiGh70OPJ6CX57QMj8I+9ChopFUvRIv6TIw=; b=jIKp8EjCw85gnhnnqoxFjFfcHEY2kpH1hMO2tDKIW0A+Czj+RRQ1DIMukgySKmvXag ZV4pGLgCGIy7mK676Bi1rszWVNoGBFwlIBia+1FXWdH+Zw/E1tl1hm3e8XbDm+ZcO6af pv/AKVZcTUe/xCVvLalXy7jQq/h5Zg1tpL+h7c77rnx7AR65/hahdRrqqsK1G7iZ4jon KIt6P1G7gxUO98Ric+AbFyXmqWfN8AA1e96IJQGyW5AVSfKpWMvfNY4KKNDYDqO+DS5m L7eLEPHOCii+ASQOoFxwpRVimFjalHXeCZTMaL4dLGXx1Ka6YUSURHrPATCmsZKY91Cq KELg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:cc:subject:references:date:mime-version :content-transfer-encoding:from:message-id:in-reply-to:user-agent; bh=1GiJUeGeUiGh70OPJ6CX57QMj8I+9ChopFUvRIv6TIw=; b=DZljzBp+ptUSU4CtPpJDscxJLuDAuWABncYE69SEMLEcTxKeR7i5CzWt2CdN0dd7fO P0qdPHnHL+rmZfMb6u+ao8ljGHtxCQnC1/sD5fSP4Ffv5W2ApZMzkdYx6rikyrTOfg2N mLrW+SvWktsdGt1n6OmET4IoEwygZ2rksTteaW6yWmIpTObxVYsRYNaEIWP3DE/QfSPH Tp19f//15drhlZ1XhFa9lT2jLD3x71TernTUrBh/l4DbfWwJDTId3Rsn7Dg4GtijV7S0 7IxKHm6t/RaB9bgGPh06XgonrqvvJQSs16bWSN7eJr08haCfpZuZEsAL+IVnt96jHiLM StkQ== X-Gm-Message-State: AE9vXwOpMvUZMQ6Bcs/mFTXmWA1w+wzYpeRZOgAUNadcRhi2iICGcKj7xxWRtjavgoNe3Q== X-Received: by 10.25.211.199 with SMTP id k190mr8643588lfg.71.1474147109305; Sat, 17 Sep 2016 14:18:29 -0700 (PDT) Received: from localhost (host-176-37-109-22.la.net.ua. [176.37.109.22]) by smtp.gmail.com with ESMTPSA id s125sm3472529lja.14.2016.09.17.14.18.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 17 Sep 2016 14:18:28 -0700 (PDT) Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: "Larry Rosenman" Cc: "Freebsd wireless" Subject: Re: (IWM) 7260 AC Dual Band - Still No Connect 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> <068abc6a7c5ec56a6bdc06655510bdb7@thebighonker.lerctr.org> Date: Sun, 18 Sep 2016 00:18:26 +0300 MIME-Version: 1.0 Content-Transfer-Encoding: Quoted-Printable From: "Andriy Voskoboinyk" Message-ID: In-Reply-To: <068abc6a7c5ec56a6bdc06655510bdb7@thebighonker.lerctr.org> User-Agent: Opera Mail/12.16 (FreeBSD) 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:18:31 -0000 Sun, 18 Sep 2016 00:13:49 +0300 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0=D0= =BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE Larry Rosenman = : For HEAD there is one more commit (r305470): svn revert --depth=3Dinfinity 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 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0= =D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE 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=3D211885 ; >> 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,-30332= 7 = >> . ) >> > > 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 > #