|
@@ -573,10 +573,12 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
|
|
case WLAN_CIPHER_SUITE_BIP_CMAC_256:
|
|
case WLAN_CIPHER_SUITE_BIP_CMAC_256:
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
offsetof(typeof(kseq), aes_cmac));
|
|
offsetof(typeof(kseq), aes_cmac));
|
|
|
|
+ /* fall through */
|
|
case WLAN_CIPHER_SUITE_BIP_GMAC_128:
|
|
case WLAN_CIPHER_SUITE_BIP_GMAC_128:
|
|
case WLAN_CIPHER_SUITE_BIP_GMAC_256:
|
|
case WLAN_CIPHER_SUITE_BIP_GMAC_256:
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
offsetof(typeof(kseq), aes_gmac));
|
|
offsetof(typeof(kseq), aes_gmac));
|
|
|
|
+ /* fall through */
|
|
case WLAN_CIPHER_SUITE_GCMP:
|
|
case WLAN_CIPHER_SUITE_GCMP:
|
|
case WLAN_CIPHER_SUITE_GCMP_256:
|
|
case WLAN_CIPHER_SUITE_GCMP_256:
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
|
|
@@ -2205,6 +2207,7 @@ static int ieee80211_scan(struct wiphy *wiphy,
|
|
* for now fall through to allow scanning only when
|
|
* for now fall through to allow scanning only when
|
|
* beaconing hasn't been configured yet
|
|
* beaconing hasn't been configured yet
|
|
*/
|
|
*/
|
|
|
|
+ /* fall through */
|
|
case NL80211_IFTYPE_AP:
|
|
case NL80211_IFTYPE_AP:
|
|
/*
|
|
/*
|
|
* If the scan has been forced (and the driver supports
|
|
* If the scan has been forced (and the driver supports
|