From mboxrd@z Thu Jan 1 00:00:00 1970 From: devik Date: Thu, 03 Jul 2003 08:23:08 +0000 Subject: [LARTC] HTB patch against 2.4.21 MIME-Version: 1 Content-Type: multipart/mixed; boundary="8323328-177220369-1057220588=:560" Message-Id: List-Id: To: lartc@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --8323328-177220369-1057220588=:560 Content-Type: TEXT/PLAIN; charset=US-ASCII Hi, I've attached patch which is submitted for .22 and should fix some dequeue-bug warnings. It is not critical but I'll be happy if you test it. ------------------------------- Martin Devera aka devik Linux kernel QoS/HTB maintainer http://luxik.cdi.cz/~devik/ --8323328-177220369-1057220588=:560 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="htb_3.10_3.12_2.diff" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="htb_3.10_3.12_2.diff" LS0tIGxpbnV4LTIuNC4yMS9uZXQvc2NoZWQvc2NoX2h0Yi5jCVRodSBKdW4g MTkgMDk6MzM6NTAgMjAwMw0KKysrIGxpbnV4LTIuNC9uZXQvc2NoZWQvc2No X2h0Yi5jCVdlZCBKdW4gMTggMjE6NTc6MDcgMjAwMw0KQEAgLTksNiArOSw4 IEBADQogICogQXV0aG9yczoJTWFydGluIERldmVyYSwgPGRldmlrQGNkaS5j ej4NCiAgKg0KICAqIENyZWRpdHMgKGluIHRpbWUgb3JkZXIpIGZvciBvbGRl ciBIVEIgdmVyc2lvbnM6DQorICogICAgICAgICAgICAgIFN0ZWYgQ29lbmUg PHN0ZWYuY29lbmVAZG9jdW0ub3JnPg0KKyAqCQkJSFRCIHN1cHBvcnQgYXQg TEFSVEMgbWFpbGluZyBsaXN0DQogICoJCU9uZHJlaiBLcmF1cywgPGtyYXVz b0BiYXJyLmN6PiANCiAgKgkJCWZvdW5kIG1pc3NpbmcgSU5JVF9RRElTQyho dGIpDQogICoJCVZsYWRpbWlyIFNtZWxoYXVzLCBBYW1lciBBa2h0ZXIsIEJl cnQgSHViZXJ0DQpAQCAtMTksNyArMjEsNyBAQA0KICAqCQkJY3JlYXRlZCB0 ZXN0IGNhc2Ugc28gdGhhdCBJIHdhcyBhYmxlIHRvIGZpeCBuYXN0eSBidWcN CiAgKgkJYW5kIG1hbnkgb3RoZXJzLiB0aGFua3MuDQogICoNCi0gKiAkSWQ6 IHNjaF9odGIuYyx2IDEuMTcgMjAwMy8wMS8yOSAwOToyMjoxOCBkZXZpayBF eHAgZGV2aWsgJA0KKyAqICRJZDogc2NoX2h0Yi5jLHYgMS4yMCAyMDAzLzA2 LzE4IDE5OjU1OjQ5IGRldmlrIEV4cCBkZXZpayAkDQogICovDQogI2luY2x1 ZGUgPGxpbnV4L2NvbmZpZy5oPg0KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUu aD4NCkBAIC03MSw3ICs3Myw3IEBADQogI2RlZmluZSBIVEJfSFlTVEVSRVNJ UyAxLyogd2hldGhlciB0byB1c2UgbW9kZSBoeXN0ZXJlc2lzIGZvciBzcGVl ZHVwICovDQogI2RlZmluZSBIVEJfUUxPQ0soUykgc3Bpbl9sb2NrX2JoKCYo UyktPmRldi0+cXVldWVfbG9jaykNCiAjZGVmaW5lIEhUQl9RVU5MT0NLKFMp IHNwaW5fdW5sb2NrX2JoKCYoUyktPmRldi0+cXVldWVfbG9jaykNCi0jZGVm aW5lIEhUQl9WRVIgMHgzMDAwYQkvKiBtYWpvciBtdXN0IGJlIG1hdGNoZWQg d2l0aCBudW1iZXIgc3VwbGllZCBieSBUQyBhcyB2ZXJzaW9uICovDQorI2Rl ZmluZSBIVEJfVkVSIDB4MzAwMGMJLyogbWFqb3IgbXVzdCBiZSBtYXRjaGVk IHdpdGggbnVtYmVyIHN1cGxpZWQgYnkgVEMgYXMgdmVyc2lvbiAqLw0KIA0K ICNpZiBIVEJfVkVSID4+IDE2ICE9IFRDX0hUQl9QUk9UT1ZFUg0KICNlcnJv ciAiTWlzbWF0Y2hlZCBzY2hfaHRiLmMgYW5kIHBrdF9zY2guaCINCkBAIC0y MTcsNiArMjE5LDkgQEANCiAgICAgLyogdGltZSBvZiBuZWFyZXN0IGV2ZW50 IHBlciBsZXZlbCAocm93KSAqLw0KICAgICB1bnNpZ25lZCBsb25nIG5lYXJf ZXZfY2FjaGVbVENfSFRCX01BWERFUFRIXTsNCiANCisgICAgLyogY2FjaGVk IHZhbHVlIG9mIGppZmZpZXMgaW4gZGVxdWV1ZSAqLw0KKyAgICB1bnNpZ25l ZCBsb25nIGppZmZpZXM7DQorDQogICAgIC8qIHdoZXRoZXIgd2UgaGl0IG5v bi13b3JrIGNvbnNlcnZpbmcgY2xhc3MgZHVyaW5nIHRoaXMgZGVxdWV1ZTsg d2UgdXNlICovDQogICAgIGludCBud2NfaGl0OwkvKiB0aGlzIHRvIGRpc2Fi bGUgbWluZGVsYXkgY29tcGxhaW50IGluIGRlcXVldWUgKi8NCiANCkBAIC0z MzYsNyArMzQxLDcgQEANCiBzdGF0aWMgdm9pZCBodGJfZGVidWdfZHVtcCAo c3RydWN0IGh0Yl9zY2hlZCAqcSkNCiB7DQogCWludCBpLHA7DQotCXByaW50 ayhLRVJOX0RFQlVHICJodGIqZyBqPSVsdVxuIixqaWZmaWVzKTsNCisJcHJp bnRrKEtFUk5fREVCVUcgImh0YipnIGo9JWx1IGxqPSVsdVxuIixqaWZmaWVz LHEtPmppZmZpZXMpOw0KIAkvKiByb3dzICovDQogCWZvciAoaT1UQ19IVEJf TUFYREVQVEgtMTtpPj0wO2ktLSkgew0KIAkJcHJpbnRrKEtFUk5fREVCVUcg Imh0YipyJWQgbT0leCIsaSxxLT5yb3dfbWFza1tpXSk7DQpAQCAtNDE5LDgg KzQyNCw4IEBADQogCWlmICgoZGVsYXkgPD0gMCB8fCBkZWxheSA+IGNsLT5t YnVmZmVyKSAmJiBuZXRfcmF0ZWxpbWl0KCkpDQogCQlwcmludGsoS0VSTl9F UlIgIkhUQjogc3VzcGljaW91cyBkZWxheSBpbiB3YWl0X3RyZWUgZD0lbGQg Y2w9JVggaD0lZFxuIixkZWxheSxjbC0+Y2xhc3NpZCxkZWJ1Z19oaW50KTsN CiAjZW5kaWYNCi0JY2wtPnBxX2tleSA9IGppZmZpZXMgKyBQU0NIRURfVVMy SklGRklFKGRlbGF5KTsNCi0JaWYgKGNsLT5wcV9rZXkgPT0gamlmZmllcykN CisJY2wtPnBxX2tleSA9IHEtPmppZmZpZXMgKyBQU0NIRURfVVMySklGRklF KGRlbGF5KTsNCisJaWYgKGNsLT5wcV9rZXkgPT0gcS0+amlmZmllcykNCiAJ CWNsLT5wcV9rZXkrKzsNCiANCiAJLyogdXBkYXRlIHRoZSBuZWFyZXN0IGV2 ZW50IGNhY2hlICovDQpAQCAtNTk4LDcgKzYwMyw3IEBADQogICAgIGxvbmcg dG9rczsNCiANCiAgICAgaWYgKCh0b2tzID0gKGNsLT5jdG9rZW5zICsgKmRp ZmYpKSA8ICgNCi0jaWZkZWYgSFRCX0hZU1RFUkVTSVMNCisjaWYgSFRCX0hZ U1RFUkVTSVMNCiAJICAgIGNsLT5jbW9kZSAhPSBIVEJfQ0FOVF9TRU5EID8g LWNsLT5jYnVmZmVyIDoNCiAjZW5kaWYNCiAgICAgICAgCSAgICAwKSkgew0K QEAgLTYwNiw3ICs2MTEsNyBAQA0KIAkgICAgcmV0dXJuIEhUQl9DQU5UX1NF TkQ7DQogICAgIH0NCiAgICAgaWYgKCh0b2tzID0gKGNsLT50b2tlbnMgKyAq ZGlmZikpID49ICgNCi0jaWZkZWYgSFRCX0hZU1RFUkVTSVMNCisjaWYgSFRC X0hZU1RFUkVTSVMNCiAJICAgIGNsLT5jbW9kZSA9PSBIVEJfQ0FOX1NFTkQg PyAtY2wtPmJ1ZmZlciA6DQogI2VuZGlmDQogCSAgICAwKSkNCkBAIC04MDks NyArODE0LDcgQEANCiAJCQkJICAgICAgIGNsLT5jbGFzc2lkLCBkaWZmLA0K IAkJCQkgICAgICAgKHVuc2lnbmVkIGxvbmcgbG9uZykgcS0+bm93LA0KIAkJ CQkgICAgICAgKHVuc2lnbmVkIGxvbmcgbG9uZykgY2wtPnRfYywNCi0JCQkJ ICAgICAgIGppZmZpZXMpOw0KKwkJCQkgICAgICAgcS0+amlmZmllcyk7DQog CQkJZGlmZiA9IDEwMDA7DQogCQl9DQogI2VuZGlmDQpAQCAtODUyLDYgKzg1 Nyw3IEBADQogICoNCiAgKiBTY2FucyBldmVudCBxdWV1ZSBmb3IgcGVuZGlu ZyBldmVudHMgYW5kIGFwcGxpZXMgdGhlbS4gUmV0dXJucyBqaWZmaWVzIHRv DQogICogbmV4dCBwZW5kaW5nIGV2ZW50ICgwIGZvciBubyBldmVudCBpbiBw cSkuDQorICogTm90ZTogQXBsaWVkIGFyZSBldmVudHMgd2hvc2UgaGF2ZSBj bC0+cHFfa2V5IDw9IGppZmZpZXMuDQogICovDQogc3RhdGljIGxvbmcgaHRi X2RvX2V2ZW50cyhzdHJ1Y3QgaHRiX3NjaGVkICpxLGludCBsZXZlbCkNCiB7 DQpAQCAtODY2LDkgKzg3Miw5IEBADQogCQl3aGlsZSAocC0+cmJfbGVmdCkg cCA9IHAtPnJiX2xlZnQ7DQogDQogCQljbCA9IHJiX2VudHJ5KHAsIHN0cnVj dCBodGJfY2xhc3MsIHBxX25vZGUpOw0KLQkJaWYgKGNsLT5wcV9rZXkgLSAo amlmZmllcysxKSA8IDB4ODAwMDAwMDApIHsNCi0JCQlIVEJfREJHKDgsMywi aHRiX2RvX2V2X3JldCBkZWxheT0lbGRcbiIsY2wtPnBxX2tleSAtIGppZmZp ZXMpOw0KLQkJCXJldHVybiBjbC0+cHFfa2V5IC0gamlmZmllczsNCisJCWlm IChjbC0+cHFfa2V5IC0gKHEtPmppZmZpZXMrMSkgPCAweDgwMDAwMDAwKSB7 DQorCQkJSFRCX0RCRyg4LDMsImh0Yl9kb19ldl9yZXQgZGVsYXk9JWxkXG4i LGNsLT5wcV9rZXkgLSBxLT5qaWZmaWVzKTsNCisJCQlyZXR1cm4gY2wtPnBx X2tleSAtIHEtPmppZmZpZXM7DQogCQl9DQogCQlodGJfc2FmZV9yYl9lcmFz ZShwLHEtPndhaXRfcHErbGV2ZWwpOw0KIAkJZGlmZiA9IFBTQ0hFRF9URElG Rl9TQUZFKHEtPm5vdywgY2wtPnRfYywgKHUzMiljbC0+bWJ1ZmZlciwgMCk7 DQpAQCAtODc5LDcgKzg4NSw3IEBADQogCQkJCSAgICAgICBjbC0+Y2xhc3Np ZCwgZGlmZiwNCiAJCQkJICAgICAgICh1bnNpZ25lZCBsb25nIGxvbmcpIHEt Pm5vdywNCiAJCQkJICAgICAgICh1bnNpZ25lZCBsb25nIGxvbmcpIGNsLT50 X2MsDQotCQkJCSAgICAgICBqaWZmaWVzKTsNCisJCQkJICAgICAgIHEtPmpp ZmZpZXMpOw0KIAkJCWRpZmYgPSAxMDAwOw0KIAkJfQ0KICNlbmRpZg0KQEAg LTk4Nyw3ICs5OTMsOCBAQA0KIAkJZGVsYXkgPSA1KkhaOw0KIAl9DQogCWRl bF90aW1lcigmcS0+dGltZXIpOw0KLQlxLT50aW1lci5leHBpcmVzID0gamlm ZmllcyArIGRlbGF5Ow0KKwkvKiB3aHkgZG9uJ3QgdXNlIGppZmZpZXMgaGVy ZSA/IGJlY2F1c2UgZXhwaXJlcyBjYW4gYmUgaW4gcGFzdCAqLw0KKwlxLT50 aW1lci5leHBpcmVzID0gcS0+amlmZmllcyArIGRlbGF5Ow0KIAlhZGRfdGlt ZXIoJnEtPnRpbWVyKTsNCiAJc2NoLT5mbGFncyB8PSBUQ1FfRl9USFJPVFRM RUQ7DQogCXNjaC0+c3RhdHMub3ZlcmxpbWl0cysrOw0KQEAgLTEwMDQsNiAr MTAxMSw3IEBADQogCWludCBldnNfdXNlZCA9IDA7DQogI2VuZGlmDQogDQor CXEtPmppZmZpZXMgPSBqaWZmaWVzOw0KIAlIVEJfREJHKDMsMSwiaHRiX2Rl cSBkaXJjbnQ9JWQgcWxlbj0lZFxuIixza2JfcXVldWVfbGVuKCZxLT5kaXJl Y3RfcXVldWUpLA0KIAkJCXNjaC0+cS5xbGVuKTsNCiANCkBAIC0xMDIzLDE0 ICsxMDMxLDE0IEBADQogCQkvKiBjb21tb24gY2FzZSBvcHRpbWl6YXRpb24g LSBza2lwIGV2ZW50IGhhbmRsZXIgcXVpY2tseSAqLw0KIAkJaW50IG07DQog CQlsb25nIGRlbGF5Ow0KLQkJaWYgKGppZmZpZXMgLSBxLT5uZWFyX2V2X2Nh Y2hlW2xldmVsXSA8IDB4ODAwMDAwMDAgfHwgMCkgew0KKwkJaWYgKHEtPmpp ZmZpZXMgLSBxLT5uZWFyX2V2X2NhY2hlW2xldmVsXSA8IDB4ODAwMDAwMDAg fHwgMCkgew0KIAkJCWRlbGF5ID0gaHRiX2RvX2V2ZW50cyhxLGxldmVsKTsN Ci0JCQlxLT5uZWFyX2V2X2NhY2hlW2xldmVsXSArPSBkZWxheSA/IGRlbGF5 IDogSFo7DQorCQkJcS0+bmVhcl9ldl9jYWNoZVtsZXZlbF0gPSBxLT5qaWZm aWVzICsgKGRlbGF5ID8gZGVsYXkgOiBIWik7DQogI2lmZGVmIEhUQl9ERUJV Rw0KIAkJCWV2c191c2VkKys7DQogI2VuZGlmDQogCQl9IGVsc2UNCi0JCQlk ZWxheSA9IHEtPm5lYXJfZXZfY2FjaGVbbGV2ZWxdIC0gamlmZmllczsJDQor CQkJZGVsYXkgPSBxLT5uZWFyX2V2X2NhY2hlW2xldmVsXSAtIHEtPmppZmZp ZXM7CQ0KIAkJDQogCQlpZiAoZGVsYXkgJiYgbWluX2RlbGF5ID4gZGVsYXkp IA0KIAkJCW1pbl9kZWxheSA9IGRlbGF5Ow0KQEAgLTEwNDksOCArMTA1Nyw4 IEBADQogI2lmZGVmIEhUQl9ERUJVRw0KIAlpZiAoIXEtPm53Y19oaXQgJiYg bWluX2RlbGF5ID49IDEwKkhaICYmIG5ldF9yYXRlbGltaXQoKSkgew0KIAkJ aWYgKG1pbl9kZWxheSA9PSBMT05HX01BWCkgew0KLQkJCXByaW50ayhLRVJO X0VSUiAiSFRCOiBkZXF1ZXVlIGJ1ZyAoJWQpLCByZXBvcnQgaXQgcGxlYXNl ICFcbiIsDQotCQkJCQlldnNfdXNlZCk7DQorCQkJcHJpbnRrKEtFUk5fRVJS ICJIVEI6IGRlcXVldWUgYnVnICglZCwlbHUsJWx1KSwgcmVwb3J0IGl0IHBs ZWFzZSAhXG4iLA0KKwkJCQkJZXZzX3VzZWQscS0+amlmZmllcyxqaWZmaWVz KTsNCiAJCQlodGJfZGVidWdfZHVtcChxKTsNCiAJCX0gZWxzZSANCiAJCQlw cmludGsoS0VSTl9XQVJOSU5HICJIVEI6IG1pbmRlbGF5PSVsZCwgc29tZSBj bGFzcyBoYXMgIg0KQEAgLTEwNTksNyArMTA2Nyw3IEBADQogI2VuZGlmDQog CWh0Yl9kZWxheV9ieSAoc2NoLG1pbl9kZWxheSA+IDUqSFogPyA1KkhaIDog bWluX2RlbGF5KTsNCiBmaW46DQotCUhUQl9EQkcoMywxLCJodGJfZGVxX2Vu ZCAlcyBqPSVsdSBza2I9JXBcbiIsc2NoLT5kZXYtPm5hbWUsamlmZmllcyxz a2IpOw0KKwlIVEJfREJHKDMsMSwiaHRiX2RlcV9lbmQgJXMgaj0lbHUgc2ti PSVwXG4iLHNjaC0+ZGV2LT5uYW1lLHEtPmppZmZpZXMsc2tiKTsNCiAJcmV0 dXJuIHNrYjsNCiB9DQogDQpAQCAtMTQyNCw3ICsxNDMyLDcgQEANCiAJcGFy ZW50ID0gcGFyZW50aWQgPT0gVENfSF9ST09UID8gTlVMTCA6IGh0Yl9maW5k IChwYXJlbnRpZCxzY2gpOw0KIA0KIAlob3B0ID0gUlRBX0RBVEEodGJbVENB X0hUQl9QQVJNUy0xXSk7DQotCUhUQl9EQkcoMCwxLCJodGJfY2hnIGNsPSVw LCBjbGlkPSVYLCBvcHQvcHJpbz0lZCwgcmF0ZT0ldSwgYnVmZj0lZCwgcXVh bnQ9JWRcbiIsIGNsLGNsP2NsLT5jbGFzc2lkOjAsKGludClob3B0LT5wcmlv LGhvcHQtPnJhdGUucmF0ZSxob3B0LT5idWZmZXIsaG9wdC0+cXVhbnR1bSk7 DQorCUhUQl9EQkcoMCwxLCJodGJfY2hnIGNsPSVwKCVYKSwgY2xpZD0lWCwg cGFyaWQ9JVgsIG9wdC9wcmlvPSVkLCByYXRlPSV1LCBidWZmPSVkLCBxdWFu dD0lZFxuIiwgY2wsY2w/Y2wtPmNsYXNzaWQ6MCxjbGFzc2lkLHBhcmVudGlk LChpbnQpaG9wdC0+cHJpbyxob3B0LT5yYXRlLnJhdGUsaG9wdC0+YnVmZmVy LGhvcHQtPnF1YW50dW0pOw0KIAlydGFiID0gcWRpc2NfZ2V0X3J0YWIoJmhv cHQtPnJhdGUsIHRiW1RDQV9IVEJfUlRBQi0xXSk7DQogCWN0YWIgPSBxZGlz Y19nZXRfcnRhYigmaG9wdC0+Y2VpbCwgdGJbVENBX0hUQl9DVEFCLTFdKTsN CiAJaWYgKCFydGFiIHx8ICFjdGFiKSBnb3RvIGZhaWx1cmU7DQo= --8323328-177220369-1057220588=:560-- _______________________________________________ LARTC mailing list / LARTC@mailman.ds9a.nl http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/