From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaldo Carvalho de Melo Subject: [IPV6] merge raw6_opt with raw6_sock Date: Mon, 17 Jan 2005 23:30:32 -0200 Message-ID: <41EC66B8.9080907@conectiva.com.br> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060700070601040908040502" Cc: Networking Team Return-path: To: "David S. Miller" , =?UTF-8?B?WU9TSElGVUpJIEhpZGU=?= =?UTF-8?B?YWtpIC8g5ZCJ6Jek6Iux5piO?= Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com List-Id: netdev.vger.kernel.org This is a multi-part message in MIME format. --------------060700070601040908040502 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi David, This finishes the inet protos part, now to the legacy protocols. Available at the usual place: bk://kernel.bkbits.net/acme/connection_sock-2.6 Regards, - Arnaldo --------------060700070601040908040502 Content-Type: text/plain; name="raw6_sock.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="raw6_sock.patch" PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQoKCkNoYW5nZVNldEAxLjIzMzUsIDIwMDUtMDEtMTUgMTk6MjQ6MTgt MDI6MDAsIGFjbWVAdG95Lmdob3N0cHJvdG9jb2xzLm5ldAogIFtJUFY2XSBtZXJnZSByYXc2 X3NvY2sgd2l0aCByYXc2X29wdAogIAogIE5vIG5lZWQgZm9yIHR3byBzdHJ1Y3RzLCBmb2xs b3cgdGhlIG5ldyBpbmV0X3NvY2sgbGF5b3V0IHN0eWxlLgogIAogIFNpZ25lZC1vZmYtYnk6 IEFybmFsZG8gQ2FydmFsaG8gZGUgTWVsbyA8YWNtZUBjb25lY3RpdmEuY29tLmJyPgogIFNp Z25lZC1vZmYtYnk6IERhdmlkIFMuIE1pbGxlciA8ZGF2ZW1AZGF2ZW1sb2Z0Lm5ldD4KCgog aW5jbHVkZS9saW51eC9pcHY2LmggfCAgIDIzICsrKysrKysrKysrLS0tLS0tLS0tLS0tCiBu ZXQvaXB2Ni9yYXcuYyAgICAgICB8ICAgNDEgKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMzIg ZGVsZXRpb25zKC0pCgoKZGlmZiAtTnJ1IGEvaW5jbHVkZS9saW51eC9pcHY2LmggYi9pbmNs dWRlL2xpbnV4L2lwdjYuaAotLS0gYS9pbmNsdWRlL2xpbnV4L2lwdjYuaAkyMDA1LTAxLTE3 IDIzOjIyOjEyIC0wMjowMAorKysgYi9pbmNsdWRlL2xpbnV4L2lwdjYuaAkyMDA1LTAxLTE3 IDIzOjIyOjEyIC0wMjowMApAQCAtMjQ3LDI3ICsyNDcsMjYgQEAKIAl9IGNvcms7CiB9Owog Ci1zdHJ1Y3QgcmF3Nl9vcHQgeworLyogV0FSTklORzogZG9uJ3QgY2hhbmdlIHRoZSBsYXlv dXQgb2YgdGhlIG1lbWJlcnMgaW4ge3Jhdyx1ZHAsdGNwfTZfc29jayEgKi8KK3N0cnVjdCBy YXc2X3NvY2sgeworCS8qIGluZXRfc29jayBoYXMgdG8gYmUgdGhlIGZpcnN0IG1lbWJlciBv ZiByYXc2X3NvY2sgKi8KKwlzdHJ1Y3QgaW5ldF9zb2NrCWluZXQ7CiAJX191MzIJCQljaGVj a3N1bTsJLyogcGVyZm9ybSBjaGVja3N1bSAqLwogCV9fdTMyCQkJb2Zmc2V0OwkJLyogY2hl Y2tzdW0gb2Zmc2V0ICAqLwotCiAJc3RydWN0IGljbXA2X2ZpbHRlcglmaWx0ZXI7Ci19Owot Ci0vKiBXQVJOSU5HOiBkb24ndCBjaGFuZ2UgdGhlIGxheW91dCBvZiB0aGUgbWVtYmVycyBp biB7cmF3LHVkcCx0Y3B9Nl9zb2NrISAqLwotc3RydWN0IHJhdzZfc29jayB7Ci0Jc3RydWN0 IGluZXRfc29jayAgaW5ldDsKLQlzdHJ1Y3QgcmF3Nl9vcHQgICByYXc2OwotCXN0cnVjdCBp cHY2X3BpbmZvIGluZXQ2OworCS8qIGlwdjZfcGluZm8gaGFzIHRvIGJlIHRoZSBsYXN0IG1l bWJlciBvZiByYXc2X3NvY2ssIHNlZSBpbmV0Nl9za19nZW5lcmljICovCisJc3RydWN0IGlw djZfcGluZm8JaW5ldDY7CiB9OwogCiBzdHJ1Y3QgdWRwNl9zb2NrIHsKIAlzdHJ1Y3QgdWRw X3NvY2sJICB1ZHA7CisJLyogaXB2Nl9waW5mbyBoYXMgdG8gYmUgdGhlIGxhc3QgbWVtYmVy IG9mIHVkcDZfc29jaywgc2VlIGluZXQ2X3NrX2dlbmVyaWMgKi8KIAlzdHJ1Y3QgaXB2Nl9w aW5mbyBpbmV0NjsKIH07CiAKIHN0cnVjdCB0Y3A2X3NvY2sgewogCXN0cnVjdCB0Y3Bfc29j awkgIHRjcDsKKwkvKiBpcHY2X3BpbmZvIGhhcyB0byBiZSB0aGUgbGFzdCBtZW1iZXIgb2Yg dGNwNl9zb2NrLCBzZWUgaW5ldDZfc2tfZ2VuZXJpYyAqLwogCXN0cnVjdCBpcHY2X3BpbmZv IGluZXQ2OwogfTsKIApAQCAtMjc3LDkgKzI3Niw5IEBACiAJcmV0dXJuIGluZXRfc2soX19z ayktPnBpbmV0NjsKIH0KIAotc3RhdGljIGlubGluZSBzdHJ1Y3QgcmF3Nl9vcHQgKiByYXc2 X3NrKGNvbnN0IHN0cnVjdCBzb2NrICpfX3NrKQorc3RhdGljIGlubGluZSBzdHJ1Y3QgcmF3 Nl9zb2NrICpyYXc2X3NrKGNvbnN0IHN0cnVjdCBzb2NrICpzaykKIHsKLQlyZXR1cm4gJigo c3RydWN0IHJhdzZfc29jayAqKV9fc2spLT5yYXc2OworCXJldHVybiAoc3RydWN0IHJhdzZf c29jayAqKXNrOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgaW5ldF9za19jb3B5X2Rlc2Nl bmRhbnQoc3RydWN0IHNvY2sgKnNrX3RvLApAQCAtMzA0LDcgKzMwMyw3IEBACiAJcmV0dXJu IE5VTEw7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc3RydWN0IHJhdzZfb3B0ICogcmF3Nl9zayhj b25zdCBzdHJ1Y3Qgc29jayAqX19zaykKK3N0YXRpYyBpbmxpbmUgc3RydWN0IHJhdzZfc29j ayAqcmF3Nl9zayhjb25zdCBzdHJ1Y3Qgc29jayAqc2spCiB7CiAJcmV0dXJuIE5VTEw7CiB9 CmRpZmYgLU5ydSBhL25ldC9pcHY2L3Jhdy5jIGIvbmV0L2lwdjYvcmF3LmMKLS0tIGEvbmV0 L2lwdjYvcmF3LmMJMjAwNS0wMS0xNyAyMzoyMjoxMiAtMDI6MDAKKysrIGIvbmV0L2lwdjYv cmF3LmMJMjAwNS0wMS0xNyAyMzoyMjoxMiAtMDI6MDAKQEAgLTExNSwxMCArMTE1LDEwIEBA CiBzdGF0aWMgX19pbmxpbmVfXyBpbnQgaWNtcHY2X2ZpbHRlcihzdHJ1Y3Qgc29jayAqc2ss IHN0cnVjdCBza19idWZmICpza2IpCiB7CiAJc3RydWN0IGljbXA2aGRyICppY21waDsKLQlz dHJ1Y3QgcmF3Nl9vcHQgKm9wdCA9IHJhdzZfc2soc2spOworCXN0cnVjdCByYXc2X3NvY2sg KnJwID0gcmF3Nl9zayhzayk7CiAKIAlpZiAocHNrYl9tYXlfcHVsbChza2IsIHNpemVvZihz dHJ1Y3QgaWNtcDZoZHIpKSkgewotCQlfX3UzMiAqZGF0YSA9ICZvcHQtPmZpbHRlci5kYXRh WzBdOworCQlfX3UzMiAqZGF0YSA9ICZycC0+ZmlsdGVyLmRhdGFbMF07CiAJCWludCBiaXRf bnI7CiAKIAkJaWNtcGggPSAoc3RydWN0IGljbXA2aGRyICopIHNrYi0+ZGF0YTsKQEAgLTMx NSwxNCArMzE1LDE0IEBACiBpbnQgcmF3djZfcmN2KHN0cnVjdCBzb2NrICpzaywgc3RydWN0 IHNrX2J1ZmYgKnNrYikKIHsKIAlzdHJ1Y3QgaW5ldF9zb2NrICppbmV0ID0gaW5ldF9zayhz ayk7Ci0Jc3RydWN0IHJhdzZfb3B0ICpyYXdfb3B0ID0gcmF3Nl9zayhzayk7CisJc3RydWN0 IHJhdzZfc29jayAqcnAgPSByYXc2X3NrKHNrKTsKIAogICAgICAgICBpZiAoIXhmcm02X3Bv bGljeV9jaGVjayhzaywgWEZSTV9QT0xJQ1lfSU4sIHNrYikpIHsKICAgICAgICAgICAgICAg ICBrZnJlZV9za2Ioc2tiKTsKICAgICAgICAgICAgICAgICByZXR1cm4gTkVUX1JYX0RST1A7 CiAgICAgICAgIH0KIAotCWlmICghcmF3X29wdC0+Y2hlY2tzdW0pCisJaWYgKCFycC0+Y2hl Y2tzdW0pCiAJCXNrYi0+aXBfc3VtbWVkID0gQ0hFQ0tTVU1fVU5ORUNFU1NBUlk7CiAKIAlp ZiAoc2tiLT5pcF9zdW1tZWQgIT0gQ0hFQ0tTVU1fVU5ORUNFU1NBUlkpIHsKQEAgLTQ1MSwy MSArNDUxLDIyIEBACiAJZ290byBvdXRfZnJlZTsKIH0KIAotc3RhdGljIGludCByYXd2Nl9w dXNoX3BlbmRpbmdfZnJhbWVzKHN0cnVjdCBzb2NrICpzaywgc3RydWN0IGZsb3dpICpmbCwg c3RydWN0IHJhdzZfb3B0ICpvcHQsIGludCBsZW4pCitzdGF0aWMgaW50IHJhd3Y2X3B1c2hf cGVuZGluZ19mcmFtZXMoc3RydWN0IHNvY2sgKnNrLCBzdHJ1Y3QgZmxvd2kgKmZsLAorCQkJ CSAgICAgc3RydWN0IHJhdzZfc29jayAqcnAsIGludCBsZW4pCiB7CiAJc3RydWN0IHNrX2J1 ZmYgKnNrYjsKIAlpbnQgZXJyID0gMDsKIAl1MTYgKmNzdW07CiAJdTMyIHRtcF9jc3VtOwog Ci0JaWYgKCFvcHQtPmNoZWNrc3VtKQorCWlmICghcnAtPmNoZWNrc3VtKQogCQlnb3RvIHNl bmQ7CiAKIAlpZiAoKHNrYiA9IHNrYl9wZWVrKCZzay0+c2tfd3JpdGVfcXVldWUpKSA9PSBO VUxMKQogCQlnb3RvIG91dDsKIAotCWlmIChvcHQtPm9mZnNldCArIDEgPCBsZW4pCi0JCWNz dW0gPSAodTE2ICopKHNrYi0+aC5yYXcgKyBvcHQtPm9mZnNldCk7CisJaWYgKHJwLT5vZmZz ZXQgKyAxIDwgbGVuKQorCQljc3VtID0gKHUxNiAqKShza2ItPmgucmF3ICsgcnAtPm9mZnNl dCk7CiAJZWxzZSB7CiAJCWVyciA9IC1FSU5WQUw7CiAJCWdvdG8gb3V0OwpAQCAtNjA5LDcg KzYxMCw3IEBACiAJc3RydWN0IGluNl9hZGRyICpkYWRkciwgKmZpbmFsX3AgPSBOVUxMLCBm aW5hbDsKIAlzdHJ1Y3QgaW5ldF9zb2NrICppbmV0ID0gaW5ldF9zayhzayk7CiAJc3RydWN0 IGlwdjZfcGluZm8gKm5wID0gaW5ldDZfc2soc2spOwotCXN0cnVjdCByYXc2X29wdCAqcmF3 X29wdCA9IHJhdzZfc2soc2spOworCXN0cnVjdCByYXc2X3NvY2sgKnJwID0gcmF3Nl9zayhz ayk7CiAJc3RydWN0IGlwdjZfdHhvcHRpb25zICpvcHQgPSBOVUxMOwogCXN0cnVjdCBpcDZf Zmxvd2xhYmVsICpmbG93bGFiZWwgPSBOVUxMOwogCXN0cnVjdCBkc3RfZW50cnkgKmRzdCA9 IE5VTEw7CkBAIC03NzEsNyArNzcyLDcgQEAKIAkJaWYgKGVycikKIAkJCWlwNl9mbHVzaF9w ZW5kaW5nX2ZyYW1lcyhzayk7CiAJCWVsc2UgaWYgKCEobXNnLT5tc2dfZmxhZ3MgJiBNU0df TU9SRSkpCi0JCQllcnIgPSByYXd2Nl9wdXNoX3BlbmRpbmdfZnJhbWVzKHNrLCAmZmwsIHJh d19vcHQsIGxlbik7CisJCQllcnIgPSByYXd2Nl9wdXNoX3BlbmRpbmdfZnJhbWVzKHNrLCAm ZmwsIHJwLCBsZW4pOwogCX0KIGRvbmU6CiAJaXA2X2RzdF9zdG9yZShzaywgZHN0LApAQCAt ODM4LDcgKzgzOSw3IEBACiBzdGF0aWMgaW50IHJhd3Y2X3NldHNvY2tvcHQoc3RydWN0IHNv Y2sgKnNrLCBpbnQgbGV2ZWwsIGludCBvcHRuYW1lLCAKIAkJCSAgICBjaGFyIF9fdXNlciAq b3B0dmFsLCBpbnQgb3B0bGVuKQogewotCXN0cnVjdCByYXc2X29wdCAqb3B0ID0gcmF3Nl9z ayhzayk7CisJc3RydWN0IHJhdzZfc29jayAqcnAgPSByYXc2X3NrKHNrKTsKIAlpbnQgdmFs OwogCiAJc3dpdGNoKGxldmVsKSB7CkBAIC04NjgsMTAgKzg2OSwxMCBAQAogCQkJaWYgKHZh bCA+IDAgJiYgKHZhbCYxKSkKIAkJCQlyZXR1cm4oLUVJTlZBTCk7CiAJCQlpZiAodmFsIDwg MCkgewotCQkJCW9wdC0+Y2hlY2tzdW0gPSAwOworCQkJCXJwLT5jaGVja3N1bSA9IDA7CiAJ CQl9IGVsc2UgewotCQkJCW9wdC0+Y2hlY2tzdW0gPSAxOwotCQkJCW9wdC0+b2Zmc2V0ID0g dmFsOworCQkJCXJwLT5jaGVja3N1bSA9IDE7CisJCQkJcnAtPm9mZnNldCA9IHZhbDsKIAkJ CX0KIAogCQkJcmV0dXJuIDA7CkBAIC04ODUsNyArODg2LDcgQEAKIHN0YXRpYyBpbnQgcmF3 djZfZ2V0c29ja29wdChzdHJ1Y3Qgc29jayAqc2ssIGludCBsZXZlbCwgaW50IG9wdG5hbWUs IAogCQkJICAgIGNoYXIgX191c2VyICpvcHR2YWwsIGludCBfX3VzZXIgKm9wdGxlbikKIHsK LQlzdHJ1Y3QgcmF3Nl9vcHQgKm9wdCA9IHJhdzZfc2soc2spOworCXN0cnVjdCByYXc2X3Nv Y2sgKnJwID0gcmF3Nl9zayhzayk7CiAJaW50IHZhbCwgbGVuOwogCiAJc3dpdGNoKGxldmVs KSB7CkBAIC05MTAsMTAgKzkxMSwxMCBAQAogCiAJc3dpdGNoIChvcHRuYW1lKSB7CiAJY2Fz ZSBJUFY2X0NIRUNLU1VNOgotCQlpZiAob3B0LT5jaGVja3N1bSA9PSAwKQorCQlpZiAocnAt PmNoZWNrc3VtID09IDApCiAJCQl2YWwgPSAtMTsKIAkJZWxzZQotCQkJdmFsID0gb3B0LT5v ZmZzZXQ7CisJCQl2YWwgPSBycC0+b2Zmc2V0OwogCQlicmVhazsKIAogCWRlZmF1bHQ6CkBA IC05NjYsOSArOTY3LDkgQEAKIHN0YXRpYyBpbnQgcmF3djZfaW5pdF9zayhzdHJ1Y3Qgc29j ayAqc2spCiB7CiAJaWYgKGluZXRfc2soc2spLT5udW0gPT0gSVBQUk9UT19JQ01QVjYpIHsK LQkJc3RydWN0IHJhdzZfb3B0ICpvcHQgPSByYXc2X3NrKHNrKTsKLQkJb3B0LT5jaGVja3N1 bSA9IDE7Ci0JCW9wdC0+b2Zmc2V0ID0gMjsKKwkJc3RydWN0IHJhdzZfc29jayAqcnAgPSBy YXc2X3NrKHNrKTsKKwkJcnAtPmNoZWNrc3VtID0gMTsKKwkJcnAtPm9mZnNldCAgID0gMjsK IAl9CiAJcmV0dXJuKDApOwogfQoK --------------060700070601040908040502--