From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from py-out-1112.google.com ([64.233.166.180]:8675 "EHLO py-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755640AbXINADI (ORCPT ); Thu, 13 Sep 2007 20:03:08 -0400 Received: by py-out-1112.google.com with SMTP id u77so1424709pyb for ; Thu, 13 Sep 2007 17:03:07 -0700 (PDT) Message-ID: <43e72e890709131703p1260f31fx2a20ea45742583ae@mail.gmail.com> Date: Thu, 13 Sep 2007 20:03:06 -0400 From: "Luis R. Rodriguez" To: "John W. Linville" Subject: [PATCH 2/3] Remove use of Atheros-specific modes from iwlwifi Cc: linux-wireless , "Zhu Yi" , "Jiri Slaby" , "Michael Wu" , "Johannes Berg" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_23095_27869090.1189728186849" Sender: linux-wireless-owner@vger.kernel.org List-ID: ------=_Part_23095_27869090.1189728186849 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline This patch removes usage of all Atheros turbo modes from iwlwifi. This patch is intended for the iwlwifi branch of wireless-dev after a pull from origin/everything once 01-remove-atheros-turbo-from-mac80211.diff is applied. Signed-off-by: Luis R. Rodriguez Signed-off-by: Johannes Berg Cc: Zhu Yi Cc: Jiri Slaby Cc: Michael Wu CC: Johannes Berg -- drivers/net/wireless/iwl-4965-rs.c | 18 ++++++------------ drivers/net/wireless/iwl-4965.c | 12 ++++-------- drivers/net/wireless/iwl-base.c | 36 +++++++----------------------------- drivers/net/wireless/iwl-channel.h | 6 ++---- 4 files changed, 19 insertions(+), 53 deletions(-) Luis ------=_Part_23095_27869090.1189728186849 Content-Type: text/x-patch; name="02-remove-atheros-turbo-from-iwlwifi.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="02-remove-atheros-turbo-from-iwlwifi.diff" X-Attachment-Id: f_f6jxgl0q W1BBVENIXSBSZW1vdmUgdXNlIG9mIEF0aGVyb3Mtc3BlY2lmaWMgbW9kZXMgZnJvbSBpd2x3aWZp CgpUaGlzIHBhdGNoIHJlbW92ZXMgdXNhZ2Ugb2YgYWxsIEF0aGVyb3MgdHVyYm8gbW9kZXMgdXNh Z2UgZnJvbSBpd2x3aWZpLgoKVGhpcyBwYXRjaCBpcyBpbnRlbmRlZCBmb3IgdGhlIGl3bHdpZmkg YnJhbmNoIG9mIHdpcmVsZXNzLWRldiBhZnRlciBhIHB1bGwKZnJvbSBvcmlnaW4vZXZlcnl0aGlu ZyBvbmNlIDAxLXJlbW92ZS1hdGhlcm9zLXR1cmJvLWZyb20tbWFjODAyMTEuZGlmZiBpcwphcHBs aWVkLgoKU2lnbmVkLW9mZi1ieTogTHVpcyBSLiBSb2RyaWd1ZXogPG1jZ3JvZkBnbWFpbC5jb20+ ClNpZ25lZC1vZmYtYnk6IEpvaGFubmVzIEJlcmcgPGpvaGFubmVzQHNpcHNvbHV0aW9ucy5uZXQ+ CgpDYzogWmh1IFlpIDx5aS56aHVAaW50ZWwuY29tPgpDYzogSmlyaSBTbGFieSA8amlyaXNsYWJ5 QGdtYWlsLmNvbT4KCmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2wtNDk2NS1y cy5jIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsLTQ5NjUtcnMuYwppbmRleCA2NjQ5M2IwLi5l NTk4YzBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2wtNDk2NS1ycy5jCisr KyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bC00OTY1LXJzLmMKQEAgLTM3Niw4ICszNzYsNyBA QCBzdGF0aWMgaW50IHJzX2dldF90YmxfaW5mb19mcm9tX21jcyhjb25zdCBzdHJ1Y3QgaXdsX3Jh dGUgKm1jc19yYXRlLAogCQkJdGJsLT5scV90eXBlID0gTFFfTk9ORTsKIAkJZWxzZSB7CiAKLQkJ CWlmICgocGh5bW9kZSA9PSBNT0RFX0FUSEVST1NfVFVSQk8pIHx8Ci0JCQkgICAgKHBoeW1vZGUg PT0gTU9ERV9JRUVFODAyMTFBKSkKKwkJCWlmIChwaHltb2RlID09IE1PREVfSUVFRTgwMjExQSkK IAkJCQl0YmwtPmxxX3R5cGUgPSBMUV9BOwogCQkJZWxzZQogCQkJCXRibC0+bHFfdHlwZSA9IExR X0c7CkBAIC01NTQsOCArNTUzLDcgQEAgc3RhdGljIGludCByc19nZXRfbG93ZXJfcmF0ZShzdHJ1 Y3QgaXdsX3JhdGVfc2NhbGVfcHJpdiAqbHFfZGF0YSwKIAlpZiAoIWlzX2xlZ2FjeSh0YmwtPmxx X3R5cGUpICYmICghaHRfcG9zc2libGUgfHwgIXNjYWxlX2luZGV4KSkgewogCQlzd2l0Y2hfdG9f bGVnYWN5ID0gMTsKIAkJc2NhbGVfaW5kZXggPSByc19odF90b19sZWdhY3lbc2NhbGVfaW5kZXhd OwotCQlpZiAoKGxxX2RhdGEtPnBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFBKSB8fAotCQkgICAg KGxxX2RhdGEtPnBoeW1vZGUgPT0gTU9ERV9BVEhFUk9TX1RVUkJPKSkKKwkJaWYgKGxxX2RhdGEt PnBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFBKQogCQkJdGJsLT5scV90eXBlID0gTFFfQTsKIAkJ ZWxzZQogCQkJdGJsLT5scV90eXBlID0gTFFfRzsKQEAgLTU3Miw4ICs1NzAsNyBAQCBzdGF0aWMg aW50IHJzX2dldF9sb3dlcl9yYXRlKHN0cnVjdCBpd2xfcmF0ZV9zY2FsZV9wcml2ICpscV9kYXRh LAogCiAJLyogbWFzayB3aXRoIHN0YXRpb24gcmF0ZSByZXN0cmljdGlvbiAqLwogCWlmIChpc19s ZWdhY3kodGJsLT5scV90eXBlKSkgewotCQlpZiAoKGxxX2RhdGEtPnBoeW1vZGUgPT0gKHU4KSBN T0RFX0lFRUU4MDIxMUEpIHx8Ci0JCSAgICAobHFfZGF0YS0+cGh5bW9kZSA9PSAodTgpIE1PREVf QVRIRVJPU19UVVJCTykpCisJCWlmIChscV9kYXRhLT5waHltb2RlID09ICh1OCkgTU9ERV9JRUVF ODAyMTFBKQogCQkJcmF0ZV9tYXNrICA9ICh1MTYpKHJhdGVfbWFzayAmCiAJCQkgICAoc3RhLT5z dXBwX3JhdGVzIDw8IElXTF9GSVJTVF9PRkRNX1JBVEUpKTsKIAkJZWxzZQpAQCAtMTQxMSw4ICsx NDA4LDcgQEAgc3RhdGljIHZvaWQgcnNfcmF0ZV9zY2FsZV9wZXJmb3JtKHN0cnVjdCBpd2xfcHJp diAqcHJpdiwKIAogCS8qIG1hc2sgd2l0aCBzdGF0aW9uIHJhdGUgcmVzdHJpY3Rpb24gKi8KIAlp ZiAoaXNfbGVnYWN5KHRibC0+bHFfdHlwZSkpIHsKLQkJaWYgKChscV9kYXRhLT5waHltb2RlID09 ICh1OCkgTU9ERV9JRUVFODAyMTFBKSB8fAotCQkgICAgKGxxX2RhdGEtPnBoeW1vZGUgPT0gKHU4 KSBNT0RFX0FUSEVST1NfVFVSQk8pKQorCQlpZiAobHFfZGF0YS0+cGh5bW9kZSA9PSAodTgpIE1P REVfSUVFRTgwMjExQSkKIAkJCXJhdGVfc2NhbGVfaW5kZXhfbXNrID0gKHUxNikgKHJhdGVfbWFz ayAmCiAJCQkJKHN0YS0+c3VwcF9yYXRlcyA8PCBJV0xfRklSU1RfT0ZETV9SQVRFKSk7CiAJCWVs c2UKQEAgLTE2NTcsOCArMTY1Myw3IEBAIG91dDoKIAkvKiBzdGEtPnR4cmF0ZSBpcyBhbiBpbmRl eCB0byBBIG1vZGUgcmF0ZXMgd2hpY2ggc3RhcnQKIAkgKiBhdCBJV0xfRklSU1RfT0ZETV9SQVRF CiAJICovCi0JaWYgKChscV9kYXRhLT5waHltb2RlID09ICh1OCkgTU9ERV9JRUVFODAyMTFBKSB8 fAotCSAgICAobHFfZGF0YS0+cGh5bW9kZSA9PSAodTgpIE1PREVfQVRIRVJPU19UVVJCTykpCisJ aWYgKGxxX2RhdGEtPnBoeW1vZGUgPT0gKHU4KSBNT0RFX0lFRUU4MDIxMUEpCiAJCXN0YS0+dHhy YXRlID0gaSAtIElXTF9GSVJTVF9PRkRNX1JBVEU7CiAKIAlyZXR1cm47CkBAIC0xODgxLDggKzE4 NzYsNyBAQCBzdGF0aWMgdm9pZCByc19yYXRlX2luaXQodm9pZCAqcHJpdl9yYXRlLCB2b2lkICpw cml2X3N0YSwKIAkvKiBGb3IgTU9ERV9JRUVFODAyMTFBIG1vZGUgY2NrIHJhdGUgYXJlIGF0IGVu ZAogCSAqIHJhdGUgdGFibGUKIAkgKi8KLQlpZiAoKGxvY2FsLT5ody5jb25mLnBoeW1vZGUgPT0g TU9ERV9JRUVFODAyMTFBKSB8fAotCSAgICAobG9jYWwtPmh3LmNvbmYucGh5bW9kZSA9PSBNT0RF X0FUSEVST1NfVFVSQk8pKQorCWlmIChsb2NhbC0+aHcuY29uZi5waHltb2RlID09IE1PREVfSUVF RTgwMjExQSkKIAkJc3RhLT5sYXN0X3R4cmF0ZSArPSBJV0xfRklSU1RfT0ZETV9SQVRFOwogCiAJ Y3JsLT5pc19kdXAgPSBwcml2LT5pc19kdXA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJl bGVzcy9pd2wtNDk2NS5jIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsLTQ5NjUuYwppbmRleCA2 YjZhYjUyLi4zYzkzYWY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2wtNDk2 NS5jCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bC00OTY1LmMKQEAgLTI1NTgsOCArMjU1 OCw3IEBAIGludCBpd2xfaHdfcmVnX3NlbmRfdHhwb3dlcihzdHJ1Y3QgaXdsX3ByaXYgKnByaXYp CiAJfQogCiAJYmFuZCA9ICgocHJpdi0+cGh5bW9kZSA9PSBNT0RFX0lFRUU4MDIxMUIpIHx8Ci0J CShwcml2LT5waHltb2RlID09IE1PREVfSUVFRTgwMjExRykgfHwKLQkJKHByaXYtPnBoeW1vZGUg PT0gTU9ERV9BVEhFUk9TX1RVUkJPRykpID8gMSA6IDA7CisJCShwcml2LT5waHltb2RlID09IE1P REVfSUVFRTgwMjExRykpOwogCiAJaXNfZmF0ID0gIGlzX2ZhdF9jaGFubmVsKHByaXYtPmFjdGl2 ZV9yeG9uLmZsYWdzKTsKIApAQCAtMjU5MSw4ICsyNTkwLDcgQEAgaW50IGl3bF9od19jaGFubmVs X3N3aXRjaChzdHJ1Y3QgaXdsX3ByaXYgKnByaXYsIHUxNiBjaGFubmVsKQogCWNvbnN0IHN0cnVj dCBpd2xfY2hhbm5lbF9pbmZvICpjaF9pbmZvOwogCiAJYmFuZCA9ICgocHJpdi0+cGh5bW9kZSA9 PSBNT0RFX0lFRUU4MDIxMUIpIHx8Ci0JCShwcml2LT5waHltb2RlID09IE1PREVfSUVFRTgwMjEx RykgfHwKLQkJKHByaXYtPnBoeW1vZGUgPT0gTU9ERV9BVEhFUk9TX1RVUkJPRykpID8gMSA6IDA7 CisJCShwcml2LT5waHltb2RlID09IE1PREVfSUVFRTgwMjExRykpOwogCiAJY2hfaW5mbyA9IGl3 bF9nZXRfY2hhbm5lbF9pbmZvKHByaXYsIHByaXYtPnBoeW1vZGUsIGNoYW5uZWwpOwogCkBAIC00 MzY3LDggKzQzNjUsNyBAQCB2b2lkIGl3bDQ5NjVfYWRkX3N0YXRpb24oc3RydWN0IGl3bF9wcml2 ICpwcml2LCBjb25zdCB1OCAqYWRkciwgaW50IGlzX2FwKQogCSAqIGFsbCB0aGUgd2F5IHRvIDFN IGluIElFRUUgb3JkZXIgYW5kIHRoZW4gc3BpbiBvbiBJRUVFICovCiAJaWYgKGlzX2FwKQogCQly ID0gSVdMX1JBVEVfNTRNX0lOREVYOwotCWVsc2UgaWYgKChwcml2LT5waHltb2RlID09IE1PREVf SUVFRTgwMjExQSkgfHwKLQkJIChwcml2LT5waHltb2RlID09IE1PREVfQVRIRVJPU19UVVJCTykp CisJZWxzZSBpZiAocHJpdi0+cGh5bW9kZSA9PSBNT0RFX0lFRUU4MDIxMUEpCiAJCXIgPSBJV0xf UkFURV82TV9JTkRFWDsKIAllbHNlCiAJCXIgPSBJV0xfUkFURV8xTV9JTkRFWDsKQEAgLTQ0MzIs OCArNDQyOSw3IEBAIHN0YXRpYyB1OCBpd2xfaXNfZmF0X3R4X2FsbG93ZWQoc3RydWN0IGl3bF9w cml2ICpwcml2LAogCQlyZXR1cm4gMDsKIAogCS8qIG5vIGZhdCB0eCBhbGxvd2VkIG9uIDIuNEdI WiAqLwotCWlmICgocHJpdi0+cGh5bW9kZSAhPSBNT0RFX0lFRUU4MDIxMUEpICYmCi0JICAgIChw cml2LT5waHltb2RlICE9IE1PREVfQVRIRVJPU19UVVJCTykpCisJaWYgKHByaXYtPnBoeW1vZGUg IT0gTU9ERV9JRUVFODAyMTFBKQogCQlyZXR1cm4gMDsKIAlyZXR1cm4gKGl3bF9pc19jaGFubmVs X2V4dGVuc2lvbihwcml2LCBwcml2LT5waHltb2RlLAogCQkJCQkgaHRfaW5mby0+Y29udHJvbF9j aGFuLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsLWJhc2UuYyBiL2RyaXZl cnMvbmV0L3dpcmVsZXNzL2l3bC1iYXNlLmMKaW5kZXggYWRkYjFhMS4uZTk2YzU3YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsLWJhc2UuYworKysgYi9kcml2ZXJzL25ldC93 aXJlbGVzcy9pd2wtYmFzZS5jCkBAIC05NzQsOCArOTc0LDcgQEAgc3RhdGljIGludCBpd2xfc2V0 X3J4b25fY2hhbm5lbChzdHJ1Y3QgaXdsX3ByaXYgKnByaXYsIHU4IHBoeW1vZGUsIHUxNiBjaGFu bmVsKQogCQlyZXR1cm4gMDsKIAogCXByaXYtPnN0YWdpbmdfcnhvbi5jaGFubmVsID0gY3B1X3Rv X2xlMTYoY2hhbm5lbCk7Ci0JaWYgKChwaHltb2RlID09IE1PREVfSUVFRTgwMjExQSkgfHwKLQkg ICAgKHBoeW1vZGUgPT0gTU9ERV9BVEhFUk9TX1RVUkJPKSkKKwlpZiAocGh5bW9kZSA9PSBNT0RF X0lFRUU4MDIxMUEpCiAJCXByaXYtPnN0YWdpbmdfcnhvbi5mbGFncyAmPSB+UlhPTl9GTEdfQkFO RF8yNEdfTVNLOwogCWVsc2UKIAkJcHJpdi0+c3RhZ2luZ19yeG9uLmZsYWdzIHw9IFJYT05fRkxH X0JBTkRfMjRHX01TSzsKQEAgLTI1NjcsOCArMjU2Niw3IEBAIHN0YXRpYyBpbnQgaXdsX3NldF9y eG9uX2h3Y3J5cHRvKHN0cnVjdCBpd2xfcHJpdiAqcHJpdiwgaW50IGh3X2RlY3J5cHQpCiAKIHN0 YXRpYyB2b2lkIGl3bF9zZXRfZmxhZ3NfZm9yX3BoeW1vZGUoc3RydWN0IGl3bF9wcml2ICpwcml2 LCB1OCBwaHltb2RlKQogewotCWlmICgocGh5bW9kZSA9PSBNT0RFX0lFRUU4MDIxMUEpIHx8Ci0J ICAgIChwaHltb2RlID09IE1PREVfQVRIRVJPU19UVVJCTykpIHsKKwlpZiAocGh5bW9kZSA9PSBN T0RFX0lFRUU4MDIxMUEpIHsKIAkJcHJpdi0+c3RhZ2luZ19yeG9uLmZsYWdzICY9CiAJCSAgICB+ KFJYT05fRkxHX0JBTkRfMjRHX01TSyB8IFJYT05fRkxHX0FVVE9fREVURUNUX01TSwogCQkgICAg ICB8IFJYT05fRkxHX0NDS19NU0spOwpAQCAtMzExMSw4ICszMTA5LDcgQEAgc3RhdGljIHZvaWQg aXdsX3NldF9yYXRlKHN0cnVjdCBpd2xfcHJpdiAqcHJpdikKIAlwcml2LT5hY3RpdmVfcmF0ZV9i YXNpYyA9IDA7CiAKIAlJV0xfREVCVUdfUkFURSgiU2V0dGluZyByYXRlcyBmb3IgODAyLjExJWNc biIsCi0JCSAgICAgICAoKGh3LT5tb2RlID09IE1PREVfSUVFRTgwMjExQSkgfHwKLQkJCShody0+ bW9kZSA9PSBNT0RFX0FUSEVST1NfVFVSQk8pKSA/CisJCSAgICAgICBody0+bW9kZSA9PSBNT0RF X0lFRUU4MDIxMUEgPwogCQkgICAgICAgJ2EnIDogKChody0+bW9kZSA9PSBNT0RFX0lFRUU4MDIx MUIpID8gJ2InIDogJ2cnKSk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgaHctPm51bV9yYXRlczsgaSsr KSB7CkBAIC01NDQxLDcgKzU0MzgsNiBAQCBjb25zdCBzdHJ1Y3QgaXdsX2NoYW5uZWxfaW5mbyAq aXdsX2dldF9jaGFubmVsX2luZm8oY29uc3Qgc3RydWN0IGl3bF9wcml2ICpwcml2LAogCWludCBp OwogCiAJc3dpdGNoIChwaHltb2RlKSB7Ci0JY2FzZSBNT0RFX0FUSEVST1NfVFVSQk86CiAJY2Fz ZSBNT0RFX0lFRUU4MDIxMUE6CiAJCWZvciAoaSA9IDE0OyBpIDwgcHJpdi0+Y2hhbm5lbF9jb3Vu dDsgaSsrKSB7CiAJCQlpZiAocHJpdi0+Y2hhbm5lbF9pbmZvW2ldLmNoYW5uZWwgPT0gY2hhbm5l bCkKQEAgLTU0NTEsNyArNTQ0Nyw2IEBAIGNvbnN0IHN0cnVjdCBpd2xfY2hhbm5lbF9pbmZvICpp d2xfZ2V0X2NoYW5uZWxfaW5mbyhjb25zdCBzdHJ1Y3QgaXdsX3ByaXYgKnByaXYsCiAKIAljYXNl IE1PREVfSUVFRTgwMjExQjoKIAljYXNlIE1PREVfSUVFRTgwMjExRzoKLQljYXNlIE1PREVfQVRI RVJPU19UVVJCT0c6CiAJCWlmIChjaGFubmVsID49IDEgJiYgY2hhbm5lbCA8PSAxNCkKIAkJCXJl dHVybiAmcHJpdi0+Y2hhbm5lbF9pbmZvW2NoYW5uZWwgLSAxXTsKIAkJYnJlYWs7CkBAIC01NjM2 LDggKzU2MzEsNyBAQCBzdGF0aWMgaW50IGl3bF9pbml0X2NoYW5uZWxfbWFwKHN0cnVjdCBpd2xf cHJpdiAqcHJpdikKIAogc3RhdGljIGlubGluZSB1MTYgaXdsX2dldF9hY3RpdmVfZHdlbGxfdGlt ZShzdHJ1Y3QgaXdsX3ByaXYgKnByaXYsIGludCBwaHltb2RlKQogewotCWlmICgocGh5bW9kZSA9 PSBNT0RFX0lFRUU4MDIxMUEpIHx8Ci0JICAgIChwaHltb2RlID09IE1PREVfQVRIRVJPU19UVVJC TykpCisJaWYgKHBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFBKQogCQlyZXR1cm4gSVdMX0FDVElW RV9EV0VMTF9USU1FXzUyOwogCWVsc2UKIAkJcmV0dXJuIElXTF9BQ1RJVkVfRFdFTExfVElNRV8y NDsKQEAgLTU2NDYsOCArNTY0MCw3IEBAIHN0YXRpYyBpbmxpbmUgdTE2IGl3bF9nZXRfYWN0aXZl X2R3ZWxsX3RpbWUoc3RydWN0IGl3bF9wcml2ICpwcml2LCBpbnQgcGh5bW9kZSkKIHN0YXRpYyB1 MTYgaXdsX2dldF9wYXNzaXZlX2R3ZWxsX3RpbWUoc3RydWN0IGl3bF9wcml2ICpwcml2LCBpbnQg cGh5bW9kZSkKIHsKIAl1MTYgYWN0aXZlID0gaXdsX2dldF9hY3RpdmVfZHdlbGxfdGltZShwcml2 LCBwaHltb2RlKTsKLQl1MTYgcGFzc2l2ZSA9ICgocGh5bW9kZSAhPSBNT0RFX0lFRUU4MDIxMUEp ICYmCi0JCSAgICAgICAocGh5bW9kZSAhPSBNT0RFX0FUSEVST1NfVFVSQk8pKSA/CisJdTE2IHBh c3NpdmUgPSAocGh5bW9kZSAhPSBNT0RFX0lFRUU4MDIxMUEpID8KIAkgICAgSVdMX1BBU1NJVkVf RFdFTExfQkFTRSArIElXTF9QQVNTSVZFX0RXRUxMX1RJTUVfMjQgOgogCSAgICBJV0xfUEFTU0lW RV9EV0VMTF9CQVNFICsgSVdMX1BBU1NJVkVfRFdFTExfVElNRV81MjsKIApAQCAtNTcyOCw4ICs1 NzIxLDcgQEAgc3RhdGljIGludCBpd2xfZ2V0X2NoYW5uZWxzX2Zvcl9zY2FuKHN0cnVjdCBpd2xf cHJpdiAqcHJpdiwgaW50IHBoeW1vZGUsCiAJCS8qIHNjYW5fcHdyX2luZm8tPnRwYy5kc3BfYXR0 ZW47ICovCiAKIAkJLypzY2FuX3B3cl9pbmZvLT50cGMudHhfZ2FpbjsgKi8KLQkJaWYgKChwaHlt b2RlID09IE1PREVfSUVFRTgwMjExQSkgfHwKLQkJICAgIChwaHltb2RlID09IE1PREVfQVRIRVJP U19UVVJCTykpCisJCWlmIChwaHltb2RlID09IE1PREVfSUVFRTgwMjExQSkKIAkJCXNjYW5fY2gt PnRwYy50eF9nYWluID0gKCgxIDw8IDUpIHwgKDMgPDwgMykpIHwgMzsKIAkJZWxzZSB7CiAJCQlz Y2FuX2NoLT50cGMudHhfZ2FpbiA9ICgoMSA8PCA1KSB8ICg1IDw8IDMpKTsKQEAgLTU4ODEsMTkg KzU4NzMsNiBAQCBzdGF0aWMgaW50IGl3bF9pbml0X2dlb3Moc3RydWN0IGl3bF9wcml2ICpwcml2 KQogCW1vZGVzW0ddLm51bV9yYXRlcyA9IDEyOwkvKiBPRkRNICYgQ0NLICovCiAJbW9kZXNbR10u bnVtX2NoYW5uZWxzID0gMDsKIAotI2lmIElXTCA9PSA0OTY1Ci0JbW9kZXNbR18xMU5dLm1vZGUg PSBNT0RFX0FUSEVST1NfVFVSQk9HOwotCW1vZGVzW0dfMTFOXS5jaGFubmVscyA9IGNoYW5uZWxz OwotCW1vZGVzW0dfMTFOXS5udW1fcmF0ZXMgPSAxMzsgICAgICAgIC8qIE9GRE0gJiBDQ0sgKi8K LQltb2Rlc1tHXzExTl0ucmF0ZXMgPSByYXRlczsKLQltb2Rlc1tHXzExTl0ubnVtX2NoYW5uZWxz ID0gMDsKLQotCW1vZGVzW0FfMTFOXS5tb2RlID0gTU9ERV9BVEhFUk9TX1RVUkJPOwotCW1vZGVz W0FfMTFOXS5jaGFubmVscyA9ICZjaGFubmVsc1tBUlJBWV9TSVpFKGl3bF9lZXByb21fYmFuZF8x KV07Ci0JbW9kZXNbQV8xMU5dLnJhdGVzID0gJnJhdGVzWzRdOwotCW1vZGVzW0FfMTFOXS5udW1f cmF0ZXMgPSA5OyAvKiBqdXN0IE9GRE0gKi8KLQltb2Rlc1tBXzExTl0ubnVtX2NoYW5uZWxzID0g MDsKLSNlbmRpZgogCXByaXYtPmllZWVfY2hhbm5lbHMgPSBjaGFubmVsczsKIAlwcml2LT5pZWVl X3JhdGVzID0gcmF0ZXM7CiAKQEAgLTgzMjksOCArODMwOCw3IEBAIHN0YXRpYyB2b2lkIGl3bF9t YWNfZ2V0X2h0X2NhcGFiKHN0cnVjdCBpZWVlODAyMTFfaHcgKmh3LAogCQl1c2Vfd2lkZV9jaGFu bmVsID0gMDsKIAogCS8qIG5vIGZhdCB0eCBhbGxvd2VkIG9uIDIuNEdIWiAqLwotCWlmICgocHJp di0+cGh5bW9kZSAhPSBNT0RFX0lFRUU4MDIxMUEpICYmCi0JICAgIChwcml2LT5waHltb2RlICE9 IE1PREVfQVRIRVJPU19UVVJCTykpCisJaWYgKHByaXYtPnBoeW1vZGUgIT0gTU9ERV9JRUVFODAy MTFBKQogCQl1c2Vfd2lkZV9jaGFubmVsID0gMDsKIAogCWl3bF9zZXRfaHRfY2FwYWIoaHcsIGh0 X2NhcCwgdXNlX3dpZGVfY2hhbm5lbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVz cy9pd2wtY2hhbm5lbC5oIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsLWNoYW5uZWwuaAppbmRl eCA5N2RhMzcwLi4wMjNjM2YyIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pd2wt Y2hhbm5lbC5oCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bC1jaGFubmVsLmgKQEAgLTEz NiwxNSArMTM2LDEzIEBAIHN0YXRpYyBpbmxpbmUgaW50IGlzX2NoYW5uZWxfcmFkYXIoY29uc3Qg c3RydWN0IGl3bF9jaGFubmVsX2luZm8gKmNoX2luZm8pCiAKIHN0YXRpYyBpbmxpbmUgdTggaXNf Y2hhbm5lbF9hX2JhbmQoY29uc3Qgc3RydWN0IGl3bF9jaGFubmVsX2luZm8gKmNoX2luZm8pCiB7 Ci0JcmV0dXJuICgoY2hfaW5mby0+cGh5bW9kZSA9PSBNT0RFX0lFRUU4MDIxMUEpIHx8Ci0JCShj aF9pbmZvLT5waHltb2RlID09IE1PREVfQVRIRVJPU19UVVJCTykpID8gMSA6IDA7CisJcmV0dXJu IGNoX2luZm8tPnBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFBOwogfQogCiBzdGF0aWMgaW5saW5l IHU4IGlzX2NoYW5uZWxfYmdfYmFuZChjb25zdCBzdHJ1Y3QgaXdsX2NoYW5uZWxfaW5mbyAqY2hf aW5mbykKIHsKIAlyZXR1cm4gKChjaF9pbmZvLT5waHltb2RlID09IE1PREVfSUVFRTgwMjExQikg fHwKLQkJKGNoX2luZm8tPnBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFHKSB8fAotCQkoY2hfaW5m by0+cGh5bW9kZSA9PSBNT0RFX0FUSEVST1NfVFVSQk9HKSkgPyAxIDogMDsKKwkJKGNoX2luZm8t PnBoeW1vZGUgPT0gTU9ERV9JRUVFODAyMTFHKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgaW50IGlz X2NoYW5uZWxfcGFzc2l2ZShjb25zdCBzdHJ1Y3QgaXdsX2NoYW5uZWxfaW5mbyAqY2gpCgo= ------=_Part_23095_27869090.1189728186849-- -: To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org: More majordomo info at http: //vger.kernel.org/majordomo-info.html