From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1b5Gkj-00016L-QR for ptxdist@pengutronix.de; Tue, 24 May 2016 20:08:25 +0200 References: <20160521235513.GA410@archie.localdomain> <74398021-6cef-6626-2a22-eff21cae84bb@pengutronix.de> <20160524130143.GA3162@archie.localdomain> <44f85c5d-0697-06b1-2e8b-334ac67fa0b8@pengutronix.de> From: Alexander Aring Message-ID: Date: Tue, 24 May 2016 20:08:25 +0200 MIME-Version: 1.0 In-Reply-To: <44f85c5d-0697-06b1-2e8b-334ac67fa0b8@pengutronix.de> Subject: Re: [ptxdist] iproute2 build errors when updating to 4.6 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de CkhpLAoKT24gMDUvMjQvMjAxNiAwNToyNCBQTSwgQWxleGFuZGVyIEFyaW5nIHdyb3RlOgouLi4K PiAKPiBBY2NvcmRpbmcgdG8gdGhlIGJ1aWxkZmFpbCBvZiAibV9pcHQubyIsIHRoaXMgc2hvdWxk IGJlIGZpeGVkIG1haW5saW5lCj4gc29tZWhvdyBhbmQgY2FuJ3Qgd29ya2luZyB3aXRoIHRoZSBp cHRhYmxlcyBpbmNsdWRlIGZpbGVzIHdoaWNoIGFyZQo+IGNvcGllZCBpbnRvIGluY2x1ZGUgZGly IG9mIGlwcm91dGUyLiA6LS8KPiAKCmZyb20gd2hhdCBJIG5vdGljZWQgZnJvbSBpcHRhYmxlcyBn aXQgbG9nLCBldGMsIHRoZXkgcmVuYW1lZAppcHRhYmxlc190YXJnZXQgdG8geHRhYmxlc190YXJn ZXQgZXRjLCBzb21lIGZ1bmN0aW9uIGFyZSBub3QgZXhwb3J0ZWQKZnJvbSBsaWIgYW55bW9yZSAo aWYgdGhleSBhcmUgc3RpbGwgdXNlZCBpbiBtX2lwdC5vIHRoZW4gZG8gYSBzdGF0aWMKaW5saW5l KS4KCk5ldmVydGhlbGVzcywgaGVyZSBpcyB0aGUgcGF0Y2ggd2hpY2ggIm1heWJlPyIgc2hvdWxk IGdvIG1haW5saW5lIHRvCmlwcm91dGUyIHRvIHdvcmsgd2l0aCB0aGUgbmV3IEFQSSBoZWFkZXIg b2YgaXB0YWJsZXMsIGJ1dCBJIGRpZG4ndAp0ZXN0ZWQgaXQuIDotKQoKLS0tCgpkaWZmIC0tZ2l0 IGEvdGMvbV9pcHQuYyBiL3RjL21faXB0LmMKaW5kZXggZDA4OGY1ZS4uMDk4ZjYxMCAxMDA2NDQK LS0tIGEvdGMvbV9pcHQuYworKysgYi90Yy9tX2lwdC5jCkBAIC0xNCw3ICsxNCw2IEBACiAjaW5j bHVkZSA8c3lzL3NvY2tldC5oPgogI2luY2x1ZGUgPG5ldGluZXQvaW4uaD4KICNpbmNsdWRlIDxh cnBhL2luZXQuaD4KLSNpbmNsdWRlIDxsaW51eC9pZi5oPgogI2luY2x1ZGUgPGlwdGFibGVzLmg+ CiAjaW5jbHVkZSA8bGludXgvbmV0ZmlsdGVyLmg+CiAjaW5jbHVkZSA8bGludXgvbmV0ZmlsdGVy X2lwdjQvaXBfdGFibGVzLmg+CkBAIC01MSw3ICs1MCw3IEBAIHN0YXRpYyBzdHJ1Y3Qgb3B0aW9u IG9yaWdpbmFsX29wdHNbXSA9IHsKIAl7MCwgMCwgMCwgMH0KIH07CiAKLXN0YXRpYyBzdHJ1Y3Qg aXB0YWJsZXNfdGFyZ2V0ICp0X2xpc3Q7CitzdGF0aWMgc3RydWN0IHh0YWJsZXNfdGFyZ2V0ICp0 X2xpc3Q7CiBzdGF0aWMgc3RydWN0IG9wdGlvbiAqb3B0cyA9IG9yaWdpbmFsX29wdHM7CiBzdGF0 aWMgdW5zaWduZWQgaW50IGdsb2JhbF9vcHRpb25fb2Zmc2V0OwogI2RlZmluZSBPUFRJT05fT0ZG U0VUIDI1NgpAQCAtNTksMzIgKzU4LDIxIEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZ2xvYmFsX29w dGlvbl9vZmZzZXQ7CiBjaGFyICpsaWJfZGlyOwogCiB2b2lkCi1yZWdpc3Rlcl90YXJnZXQoc3Ry dWN0IGlwdGFibGVzX3RhcmdldCAqbWUpCit4dGFibGVzX3JlZ2lzdGVyX3RhcmdldChzdHJ1Y3Qg eHRhYmxlc190YXJnZXQgKm1lKQogewotLyogICAgICBmcHJpbnRmKHN0ZGVyciwgIlxuRHVtbXkg cmVnaXN0ZXJfdGFyZ2V0ICVzXG4iLCBtZS0+bmFtZSk7Ci0qLwogCW1lLT5uZXh0ID0gdF9saXN0 OwogCXRfbGlzdCA9IG1lOwogCiB9CiAKLXZvaWQKLXh0YWJsZXNfcmVnaXN0ZXJfdGFyZ2V0KHN0 cnVjdCBpcHRhYmxlc190YXJnZXQgKm1lKQotewotCW1lLT5uZXh0ID0gdF9saXN0OwotCXRfbGlz dCA9IG1lOwotfQotCi12b2lkCi1leGl0X3RyeWhlbHAoaW50IHN0YXR1cykKK3N0YXRpYyB2b2lk IGV4aXRfdHJ5aGVscChpbnQgc3RhdHVzKQogewogCWZwcmludGYoc3RkZXJyLCAiVHJ5IGAlcyAt aCcgb3IgJyVzIC0taGVscCcgZm9yIG1vcmUgaW5mb3JtYXRpb24uXG4iLAogCQlwbmFtZSwgcG5h bWUpOwogCWV4aXQoc3RhdHVzKTsKIH0KIAotdm9pZAotZXhpdF9lcnJvcihlbnVtIGV4aXR0eXBl IHN0YXR1cywgY2hhciAqbXNnLCAuLi4pCitzdGF0aWMgdm9pZCBleGl0X2Vycm9yKGVudW0geHRh Ymxlc19leGl0dHlwZSBzdGF0dXMsIGNoYXIgKm1zZywgLi4uKQogewogCXZhX2xpc3QgYXJnczsK IApAQCAtMTA2LDYxICs5NCw2IEBAIFRoZXkgc2hvdWxkIHJlYWxseSBoYXZlIHRoZW0gYXMgYSBs aWJyYXJ5IHNvIGkgY2FuIGxpbmsgdG8gdGhlbQogRW1haWwgdGhlbSBuZXh0IHRpbWUgaSByZW1l bWJlcgogKi8KIAotY2hhciAqCi1hZGRyX3RvX2RvdHRlZChjb25zdCBzdHJ1Y3QgaW5fYWRkciAq YWRkcnApCi17Ci0Jc3RhdGljIGNoYXIgYnVmWzIwXTsKLQljb25zdCB1bnNpZ25lZCBjaGFyICpi eXRlcDsKLQotCWJ5dGVwID0gKGNvbnN0IHVuc2lnbmVkIGNoYXIgKikgJihhZGRycC0+c19hZGRy KTsKLQlzcHJpbnRmKGJ1ZiwgIiVkLiVkLiVkLiVkIiwgYnl0ZXBbMF0sIGJ5dGVwWzFdLCBieXRl cFsyXSwgYnl0ZXBbM10pOwotCXJldHVybiBidWY7Ci19Ci0KLWludCBzdHJpbmdfdG9fbnVtYmVy X2xsKGNvbnN0IGNoYXIgKnMsIHVuc2lnbmVkIGxvbmcgbG9uZyBtaW4sCi0JCQl1bnNpZ25lZCBs b25nIGxvbmcgbWF4LAotCQkgdW5zaWduZWQgbG9uZyBsb25nICpyZXQpCi17Ci0JdW5zaWduZWQg bG9uZyBsb25nIG51bWJlcjsKLQljaGFyICplbmQ7Ci0KLQkvKiBIYW5kbGUgaGV4LCBvY3RhbCwg ZXRjLiAqLwotCWVycm5vID0gMDsKLQludW1iZXIgPSBzdHJ0b3VsbChzLCAmZW5kLCAwKTsKLQlp ZiAoKmVuZCA9PSAnXDAnICYmIGVuZCAhPSBzKSB7Ci0JCS8qIHdlIHBhcnNlZCBhIG51bWJlciwg bGV0J3Mgc2VlIGlmIHdlIHdhbnQgdGhpcyAqLwotCQlpZiAoZXJybm8gIT0gRVJBTkdFICYmIG1p biA8PSBudW1iZXIgJiYgKCFtYXggfHwgbnVtYmVyIDw9IG1heCkpIHsKLQkJCSpyZXQgPSBudW1i ZXI7Ci0JCQlyZXR1cm4gMDsKLQkJfQotCX0KLQlyZXR1cm4gLTE7Ci19Ci0KLWludCBzdHJpbmdf dG9fbnVtYmVyX2woY29uc3QgY2hhciAqcywgdW5zaWduZWQgbG9uZyBtaW4sIHVuc2lnbmVkIGxv bmcgbWF4LAotCQkgICAgICAgdW5zaWduZWQgbG9uZyAqcmV0KQotewotCWludCByZXN1bHQ7Ci0J dW5zaWduZWQgbG9uZyBsb25nIG51bWJlcjsKLQotCXJlc3VsdCA9IHN0cmluZ190b19udW1iZXJf bGwocywgbWluLCBtYXgsICZudW1iZXIpOwotCSpyZXQgPSAodW5zaWduZWQgbG9uZyludW1iZXI7 Ci0KLQlyZXR1cm4gcmVzdWx0OwotfQotCi1pbnQgc3RyaW5nX3RvX251bWJlcihjb25zdCBjaGFy ICpzLCB1bnNpZ25lZCBpbnQgbWluLCB1bnNpZ25lZCBpbnQgbWF4LAotCQl1bnNpZ25lZCBpbnQg KnJldCkKLXsKLQlpbnQgcmVzdWx0OwotCXVuc2lnbmVkIGxvbmcgbnVtYmVyOwotCi0JcmVzdWx0 ID0gc3RyaW5nX3RvX251bWJlcl9sKHMsIG1pbiwgbWF4LCAmbnVtYmVyKTsKLQkqcmV0ID0gKHVu c2lnbmVkIGludCludW1iZXI7Ci0KLQlyZXR1cm4gcmVzdWx0OwotfQotCiBzdGF0aWMgdm9pZCBm cmVlX29wdHMoc3RydWN0IG9wdGlvbiAqbG9jYWxfb3B0cykKIHsKIAlpZiAobG9jYWxfb3B0cyAh PSBvcmlnaW5hbF9vcHRzKSB7CkBAIC0yMDUsMTAgKzEzOCwxMCBAQCBmd19jYWxsb2Moc2l6ZV90 IGNvdW50LCBzaXplX3Qgc2l6ZSkKIAlyZXR1cm4gcDsKIH0KIAotc3RhdGljIHN0cnVjdCBpcHRh Ymxlc190YXJnZXQgKgorc3RhdGljIHN0cnVjdCB4dGFibGVzX3RhcmdldCAqCiBmaW5kX3QoY2hh ciAqbmFtZSkKIHsKLQlzdHJ1Y3QgaXB0YWJsZXNfdGFyZ2V0ICptOworCXN0cnVjdCB4dGFibGVz X3RhcmdldCAqbTsKIAogCWZvciAobSA9IHRfbGlzdDsgbTsgbSA9IG0tPm5leHQpIHsKIAkJaWYg KHN0cmNtcChtLT5uYW1lLCBuYW1lKSA9PSAwKQpAQCAtMjE4LDEzICsxNTEsMTMgQEAgZmluZF90 KGNoYXIgKm5hbWUpCiAJcmV0dXJuIE5VTEw7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaXB0YWJsZXNf dGFyZ2V0ICoKK3N0YXRpYyBzdHJ1Y3QgeHRhYmxlc190YXJnZXQgKgogZ2V0X3RhcmdldF9uYW1l KGNvbnN0IGNoYXIgKm5hbWUpCiB7CiAJdm9pZCAqaGFuZGxlOwogCWNoYXIgKmVycm9yOwogCWNo YXIgKm5ld19uYW1lLCAqbG5hbWU7Ci0Jc3RydWN0IGlwdGFibGVzX3RhcmdldCAqbTsKKwlzdHJ1 Y3QgeHRhYmxlc190YXJnZXQgKm07CiAJY2hhciBwYXRoW3N0cmxlbihsaWJfZGlyKSArIHNpemVv ZigiL2xpYmlwdF8uc28iKSArIHN0cmxlbihuYW1lKV07CiAKICNpZmRlZiBOT19TSEFSRURfTElC UwpAQCAtMjkxLDcgKzIyNCw3IEBAIGdldF90YXJnZXRfbmFtZShjb25zdCBjaGFyICpuYW1lKQog CiAJbSA9IGRsc3ltKGhhbmRsZSwgbmV3X25hbWUpOwogCWlmICgoZXJyb3IgPSBkbGVycm9yKCkp ICE9IE5VTEwpIHsKLQkJbSA9IChzdHJ1Y3QgaXB0YWJsZXNfdGFyZ2V0ICopIGRsc3ltKGhhbmRs ZSwgbG5hbWUpOworCQltID0gKHN0cnVjdCB4dGFibGVzX3RhcmdldCAqKSBkbHN5bShoYW5kbGUs IGxuYW1lKTsKIAkJaWYgKChlcnJvciA9IGRsZXJyb3IoKSkgIT0gTlVMTCkgewogCQkJbSA9IGZp bmRfdChuZXdfbmFtZSk7CiAJCQlpZiAobSA9PSBOVUxMKSB7CkBAIC0zMTMsNDIgKzI0Niw2IEBA IGdldF90YXJnZXRfbmFtZShjb25zdCBjaGFyICpuYW1lKQogCXJldHVybiBtOwogfQogCi0KLXN0 cnVjdCBpbl9hZGRyICpkb3R0ZWRfdG9fYWRkcihjb25zdCBjaGFyICpkb3R0ZWQpCi17Ci0Jc3Rh dGljIHN0cnVjdCBpbl9hZGRyIGFkZHI7Ci0JdW5zaWduZWQgY2hhciAqYWRkcnA7Ci0JY2hhciAq cCwgKnE7Ci0JdW5zaWduZWQgaW50IG9uZWJ5dGU7Ci0JaW50IGk7Ci0JY2hhciBidWZbMjBdOwot Ci0JLyogY29weSBkb3R0ZWQgc3RyaW5nLCBiZWNhdXNlIHdlIG5lZWQgdG8gbW9kaWZ5IGl0ICov Ci0Jc3RybmNweShidWYsIGRvdHRlZCwgc2l6ZW9mKGJ1ZikgLSAxKTsKLQlhZGRycCA9ICh1bnNp Z25lZCBjaGFyICopICYoYWRkci5zX2FkZHIpOwotCi0JcCA9IGJ1ZjsKLQlmb3IgKGkgPSAwOyBp IDwgMzsgaSsrKSB7Ci0JCWlmICgocSA9IHN0cmNocihwLCAnLicpKSA9PSBOVUxMKQotCQkJcmV0 dXJuIChzdHJ1Y3QgaW5fYWRkciAqKSBOVUxMOwotCi0JCSpxID0gJ1wwJzsKLQkJaWYgKHN0cmlu Z190b19udW1iZXIocCwgMCwgMjU1LCAmb25lYnl0ZSkgPT0gLTEpCi0JCQlyZXR1cm4gKHN0cnVj dCBpbl9hZGRyICopIE5VTEw7Ci0KLQkJYWRkcnBbaV0gPSAodW5zaWduZWQgY2hhcikgb25lYnl0 ZTsKLQkJcCA9IHEgKyAxOwotCX0KLQotCS8qIHdlJ3ZlIGNoZWNrZWQgMyBieXRlcywgbm93IHdl IGNoZWNrIHRoZSBsYXN0IG9uZSAqLwotCWlmIChzdHJpbmdfdG9fbnVtYmVyKHAsIDAsIDI1NSwg Jm9uZWJ5dGUpID09IC0xKQotCQlyZXR1cm4gKHN0cnVjdCBpbl9hZGRyICopIE5VTEw7Ci0KLQlh ZGRycFszXSA9ICh1bnNpZ25lZCBjaGFyKSBvbmVieXRlOwotCi0JcmV0dXJuICZhZGRyOwotfQot CiBzdGF0aWMgdm9pZCBzZXRfcmV2aXNpb24oY2hhciAqbmFtZSwgdV9pbnQ4X3QgcmV2aXNpb24p CiB7CiAJLyogT2xkIGtlcm5lbCBzb3VyY2VzIGRvbid0IGhhdmUgIi5yZXZpc2lvbiIgZmllbGQs CkBAIC0zNjAsMjMgKzI1NywyMCBAQCBzdGF0aWMgdm9pZCBzZXRfcmV2aXNpb24oY2hhciAqbmFt ZSwgdV9pbnQ4X3QgcmV2aXNpb24pCiAvKgogICogd2UgbWF5IG5lZWQgdG8gY2hlY2sgZm9yIHZl cnNpb24gbWlzbWF0Y2gKICovCi1pbnQKLWJ1aWxkX3N0KHN0cnVjdCBpcHRhYmxlc190YXJnZXQg KnRhcmdldCwgc3RydWN0IGlwdF9lbnRyeV90YXJnZXQgKnQpCitzdGF0aWMgaW50IGJ1aWxkX3N0 KHN0cnVjdCB4dGFibGVzX3RhcmdldCAqdGFyZ2V0LCBzdHJ1Y3QgaXB0X2VudHJ5X3RhcmdldCAq dCkKIHsKLQl1bnNpZ25lZCBpbnQgbmZjYWNoZSA9IDA7Ci0KIAlpZiAodGFyZ2V0KSB7CiAJCXNp emVfdCBzaXplOwogCiAJCXNpemUgPQotCQkgICAgSVBUX0FMSUdOKHNpemVvZihzdHJ1Y3QgaXB0 X2VudHJ5X3RhcmdldCkpICsgdGFyZ2V0LT5zaXplOworCQkgICAgWFRfQUxJR04oc2l6ZW9mKHN0 cnVjdCBpcHRfZW50cnlfdGFyZ2V0KSkgKyB0YXJnZXQtPnNpemU7CiAKIAkJaWYgKHQgPT0gTlVM TCkgewogCQkJdGFyZ2V0LT50ID0gZndfY2FsbG9jKDEsIHNpemUpOwogCQkJdGFyZ2V0LT50LT51 LnRhcmdldF9zaXplID0gc2l6ZTsKIAogCQkJaWYgKHRhcmdldC0+aW5pdCAhPSBOVUxMKQotCQkJ CXRhcmdldC0+aW5pdCh0YXJnZXQtPnQsICZuZmNhY2hlKTsKKwkJCQl0YXJnZXQtPmluaXQodGFy Z2V0LT50KTsKIAkJCXNldF9yZXZpc2lvbih0YXJnZXQtPnQtPnUudXNlci5uYW1lLCB0YXJnZXQt PnJldmlzaW9uKTsKIAkJfSBlbHNlIHsKIAkJCXRhcmdldC0+dCA9IHQ7CkBAIC0zOTEsNyArMjg1 LDcgQEAgYnVpbGRfc3Qoc3RydWN0IGlwdGFibGVzX3RhcmdldCAqdGFyZ2V0LCBzdHJ1Y3QgaXB0 X2VudHJ5X3RhcmdldCAqdCkKIHN0YXRpYyBpbnQgcGFyc2VfaXB0KHN0cnVjdCBhY3Rpb25fdXRp bCAqYSwgaW50ICphcmdjX3AsCiAJCSAgICAgY2hhciAqKiphcmd2X3AsIGludCB0Y2FfaWQsIHN0 cnVjdCBubG1zZ2hkciAqbikKIHsKLQlzdHJ1Y3QgaXB0YWJsZXNfdGFyZ2V0ICptID0gTlVMTDsK KwlzdHJ1Y3QgeHRhYmxlc190YXJnZXQgKm0gPSBOVUxMOwogCXN0cnVjdCBpcHRfZW50cnkgZnc7 CiAJc3RydWN0IHJ0YXR0ciAqdGFpbDsKIAlpbnQgYzsKQEAgLTU3NCw3ICs0NjgsNyBAQCBwcmlu dF9pcHQoc3RydWN0IGFjdGlvbl91dGlsICphdSwgRklMRSAqIGYsIHN0cnVjdCBydGF0dHIgKmFy ZykKIAkJZnByaW50ZihmLCAiXHRbTlVMTCBpcHQgdGFyZ2V0IHBhcmFtZXRlcnMgXVxuIik7CiAJ CXJldHVybiAtMTsKIAl9IGVsc2UgewotCQlzdHJ1Y3QgaXB0YWJsZXNfdGFyZ2V0ICptID0gTlVM TDsKKwkJc3RydWN0IHh0YWJsZXNfdGFyZ2V0ICptID0gTlVMTDsKIAogCQl0ID0gUlRBX0RBVEEo dGJbVENBX0lQVF9UQVJHXSk7CiAJCW0gPSBnZXRfdGFyZ2V0X25hbWUodC0+dS51c2VyLm5hbWUp OwoKLSBBbGV4CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpwdHhkaXN0IG1haWxpbmcgbGlzdApwdHhkaXN0QHBlbmd1dHJvbml4LmRl