From owner-svn-src-head@FreeBSD.ORG Sun Jul 14 18:26:49 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 51E2A8E9; Sun, 14 Jul 2013 18:26:49 +0000 (UTC) (envelope-from rpaulo@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 33767CDC; Sun, 14 Jul 2013 18:26:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EIQnwQ057103; Sun, 14 Jul 2013 18:26:49 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6EIQlH2057096; Sun, 14 Jul 2013 18:26:47 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201307141826.r6EIQlH2057096@svn.freebsd.org> From: Rui Paulo Date: Sun, 14 Jul 2013 18:26:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253340 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 18:26:49 -0000 Author: rpaulo Date: Sun Jul 14 18:26:47 2013 New Revision: 253340 URL: http://svnweb.freebsd.org/changeset/base/253340 Log: Revert r252725 as it breaks WPA. We need to fix wpa_supplicant because it checks whether the card has ic_cryptocaps set. Since net80211 can do software encryption this check in wpa_supplicant is wrong. Modified: head/sys/dev/usb/wlan/if_rum.c head/sys/dev/usb/wlan/if_uath.c head/sys/dev/usb/wlan/if_upgt.c head/sys/dev/usb/wlan/if_ural.c head/sys/dev/usb/wlan/if_urtw.c head/sys/dev/usb/wlan/if_urtwn.c head/sys/dev/usb/wlan/if_zyd.c Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_rum.c Sun Jul 14 18:26:47 2013 (r253340) @@ -502,12 +502,6 @@ rum_attach(device_t self) | IEEE80211_C_WPA /* 802.11i */ ; - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); Modified: head/sys/dev/usb/wlan/if_uath.c ============================================================================== --- head/sys/dev/usb/wlan/if_uath.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_uath.c Sun Jul 14 18:26:47 2013 (r253340) @@ -457,12 +457,6 @@ uath_attach(device_t dev) IEEE80211_C_BGSCAN | /* capable of bg scanning */ IEEE80211_C_TXFRAG; /* handle tx frags */ - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - /* put a regulatory domain to reveal informations. */ uath_regdomain = sc->sc_devcap.regDomain; Modified: head/sys/dev/usb/wlan/if_upgt.c ============================================================================== --- head/sys/dev/usb/wlan/if_upgt.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_upgt.c Sun Jul 14 18:26:47 2013 (r253340) @@ -353,12 +353,6 @@ upgt_attach(device_t dev) | IEEE80211_C_WPA /* 802.11i */ ; - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); Modified: head/sys/dev/usb/wlan/if_ural.c ============================================================================== --- head/sys/dev/usb/wlan/if_ural.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_ural.c Sun Jul 14 18:26:47 2013 (r253340) @@ -487,12 +487,6 @@ ural_attach(device_t self) | IEEE80211_C_WPA /* 802.11i */ ; - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); Modified: head/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtw.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_urtw.c Sun Jul 14 18:26:47 2013 (r253340) @@ -893,12 +893,6 @@ urtw_attach(device_t dev) IEEE80211_C_BGSCAN | /* capable of bg scanning */ IEEE80211_C_WPA; /* 802.11i */ - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_urtwn.c Sun Jul 14 18:26:47 2013 (r253340) @@ -419,12 +419,6 @@ urtwn_attach(device_t self) | IEEE80211_C_WPA /* 802.11i */ ; - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G); Modified: head/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- head/sys/dev/usb/wlan/if_zyd.c Sun Jul 14 10:22:00 2013 (r253339) +++ head/sys/dev/usb/wlan/if_zyd.c Sun Jul 14 18:26:47 2013 (r253340) @@ -400,12 +400,6 @@ zyd_attach(device_t dev) | IEEE80211_C_WPA /* 802.11i */ ; - ic->ic_cryptocaps = - IEEE80211_CRYPTO_WEP | - IEEE80211_CRYPTO_AES_CCM | - IEEE80211_CRYPTO_TKIPMIC | - IEEE80211_CRYPTO_TKIP; - bands = 0; setbit(&bands, IEEE80211_MODE_11B); setbit(&bands, IEEE80211_MODE_11G);