From owner-svn-src-stable-9@FreeBSD.ORG Tue Jan 15 07:41:51 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 168DD2B4; Tue, 15 Jan 2013 07:41:51 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 082B51AB; Tue, 15 Jan 2013 07:41:51 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0F7fo0d031688; Tue, 15 Jan 2013 07:41:50 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0F7fo86031687; Tue, 15 Jan 2013 07:41:50 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201301150741.r0F7fo86031687@svn.freebsd.org> From: Dimitry Andric Date: Tue, 15 Jan 2013 07:41:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245449 - stable/9/sys/dev/ath/ath_hal/ar9002 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 07:41:51 -0000 Author: dim Date: Tue Jan 15 07:41:50 2013 New Revision: 245449 URL: http://svnweb.freebsd.org/changeset/base/245449 Log: Revert the MFC to sys/dev/ath/ath_hal/ar9002/ar9285_attach.c again, since it does not compile on stable/9. During testing, I had a different local fix, so I failed to notice this did not work. Apologies for the breakage. Pointy hat to: dim Modified: stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Tue Jan 15 07:07:29 2013 (r245448) +++ stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Tue Jan 15 07:41:50 2013 (r245449) @@ -134,18 +134,6 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s ar5416InitState(AH5416(ah), devid, sc, st, sh, status); - /* - * Use the "local" EEPROM data given to us by the higher layers. - * This is a private copy out of system flash. The Linux ath9k - * commit for the initial AR9130 support mentions MMIO flash - * access is "unreliable." -adrian - */ - if (eepromdata != AH_NULL) { - AH_PRIVATE(ah)->ah_eepromRead = ath_hal_EepromDataRead; - AH_PRIVATE(ah)->ah_eepromWrite = NULL; - ah->ah_eepromdata = eepromdata; - } - /* XXX override with 9285 specific state */ /* override 5416 methods for our needs */ AH5416(ah)->ah_initPLL = ar9280InitPLL;