Message ID | 1527159453-30360-1-git-send-email-aaron.komisar@tandemg.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <backports-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 151926032C for <patchwork-backports@patchwork.kernel.org>; Thu, 24 May 2018 10:57:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 144A82936F for <patchwork-backports@patchwork.kernel.org>; Thu, 24 May 2018 10:57:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0664029373; Thu, 24 May 2018 10:57:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D64A2936F for <patchwork-backports@patchwork.kernel.org>; Thu, 24 May 2018 10:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030336AbeEXK5w (ORCPT <rfc822;patchwork-backports@patchwork.kernel.org>); Thu, 24 May 2018 06:57:52 -0400 Received: from mail-he1eur01on0103.outbound.protection.outlook.com ([104.47.0.103]:45289 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032640AbeEXK5t (ORCPT <rfc822;backports@vger.kernel.org>); Thu, 24 May 2018 06:57:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tandemg.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/hbLuPj12XYL/DI7yGCLJ7FJOob+MI6aDG3lVPnhqOM=; b=p5wEGCkKwt9U8iecuhLfuKeHEpn1HHTPN5Gn4ScawGyQGfVoAlaI+U7njQc9b350QdXQgmO2r3ZDJqVRJzD4sojRcL6/0XzFE2u3JyUk84G5xLFt++hRalGmlLeV/WR9umzYImFx1gwfNED2+J9cu3YoHMkFBn+bu5pRe/nDQ84= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aaron.komisar@tandemg.com; Received: from aaron-Latitude-E6420.tandemg.local (37.142.120.98) by VI1PR0202MB2926.eurprd02.prod.outlook.com (2603:10a6:800:de::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Thu, 24 May 2018 10:57:45 +0000 From: Aaron Komisar <aaron.komisar@tandemg.com> To: backports@vger.kernel.org Cc: Aaron Komisar <aaron.komisar@tandemg.com> Subject: [PATCH] Updating id field in backports genl family Date: Thu, 24 May 2018 13:57:33 +0300 Message-Id: <1527159453-30360-1-git-send-email-aaron.komisar@tandemg.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.120.98] X-ClientProxiedBy: AM5PR0202CA0005.eurprd02.prod.outlook.com (2603:10a6:203:69::15) To VI1PR0202MB2926.eurprd02.prod.outlook.com (2603:10a6:800:de::9) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2926; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2926; 3:wA+OjbLemUg55pZ6B7HrfVmu7XJMWb/05BRhXW7QiOiJ7EDUwHwNzPpBnknS+hwviKTSZECku/2sy6fjrH9M3uDMiwQsmfVC3E+HAS7L/QJJyeVrEfAE3s89XN+bSyMnOnOZPAQgMb4EJpR7lc64nxqG0XTLDYceejs2zHxrXv4M55mukDy8ZyrZ0Jn4c6u54HVTKLH6JkLbL/iWPIXvhDsWzwCXrhZM4cXCyF1pXGoJ7Y8jlYIDIE0j8GuPZYHa; 25:nTFG1ZywsrU177kG59WSL7P3BjQeSgeKB4e5fahjt+V7/+wCccvmXzKbuSaUuA4bgvM/RqHWrN/8+DsP3w1nIXP8y4ZZ+xZa5fVDfZv6RyUc8NGCl2OfjG/nEilgZADozHym3KAwyH/O4Bu9gNqJ3cZKJ3Kc8NSzLPko4b8tsYEQSUkLLoBdWmuECoR5PHa4frOnO4Sq/AvP+PhO08olxZlKwXEZd4jGB1nr1gt3OlrNtvZxEM8w2YZzrK7bqWpPNc8CviIFJdn+kSSjFrDiiy4xsWzd2/K0AYZIw8xAal11xhyFBkWeLl9Ei+Bq7KH32X4XeM3htS2oHrXdiybpjQ==; 31:f3qaR77zDo0R+GgWFwZRYKFqGpD9i3m3tV+3Ebj0eQUL3lUZBE26Ps9otXxoPQzYZ2SxlE68USuwUpyLDc82zdsvk5l1AD4/OgbSlWte+64Zibgo3vt0jZKNZxQyvCr3nOGe7g/lrPOJv10KK16GbkX2EtGmx/ovFDzQC+VriVdVDfj0JOkC8wjcNiOvB4hLPjbD+ttOz+6KjIqz2W3YtoIc9xGZS5CGYgrXCRwQHm8= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2926: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2926; 20:qniiV/nI012FaJF/PzMq2qtdwvBeWVr7gNMVh+woLxMqex2NiBFfBXfgM/FZ5QFbo3orf56ogJxbrdBFuZlRFXUdAEGaHVlAYi1IjHUFhJBS8qJXWhypJGxmj7q9xSzc1tMCWZ3hUyWf+qotlepStkBSkak597moU0B8tWBhTjZ1pXmFmAJJq/7W1qOFzVuW9neK5m8iDQXecPCiiX0ly0SxnSvDMeDeRCuZrcjPlr5lfiUkdp9lTcqkshNp9wEn; 4:dlvna0SX/IAIqiYX+mCH3q4zijH3tyzNZOd8JgPpqcVufDzku9PqXj2UmihRwVpnL1qOH20pr8m3ztC2V327pwI6WeeooVm1zsOxhU0EYL2q7JRpk8eOmGjRwJ2NmX1jbWcl8n6WYo1zmKSc4c+86vq+AovS2TZ3UNbZje4YSA5lBdN6ypsJ7lyjyUV7votqrK1bPnIkyc1CpTdrtmaiBJM+YC3LaUO83fpMZFi/kjMYtQLMin8AoNafPDJNrxUVE1im3YsxkWTv8GVBWEyIaw== X-Microsoft-Antispam-PRVS: <VI1PR0202MB2926E6E814ECF3E548042323F86A0@VI1PR0202MB2926.eurprd02.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0202MB2926; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2926; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(366004)(39380400002)(39830400003)(376002)(346002)(199004)(189003)(386003)(107886003)(5660300001)(6486002)(8936002)(186003)(6506007)(16526019)(3846002)(6116002)(8676002)(26005)(305945005)(81166006)(53936002)(50226002)(81156014)(6916009)(59450400001)(2616005)(51416003)(105586002)(7736002)(956004)(4326008)(68736007)(6666003)(2906002)(106356001)(97736004)(50466002)(486006)(316002)(16586007)(476003)(2351001)(6512007)(66066001)(25786009)(478600001)(47776003)(52116002)(44832011)(86362001)(1857600001)(36756003)(48376002)(2361001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2926; H:aaron-Latitude-E6420.tandemg.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: tandemg.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0202MB2926; 23:JWzMfWgv75R8KCDiRrQWnZO5TS31sCAq9z0YVos?= =?us-ascii?Q?RrHAaRG2Ke3v1QBta7zvuansAWXSEE3YlmyBprA+1WhzI5i2xLDl1ARjY6H7?= =?us-ascii?Q?263xT8jrUu+zbVMLH12v02E3G2rPpefWPXqnuonvjVOK/esUULr90yiDLFrH?= =?us-ascii?Q?TFOSfqsnhUVml3M63ye6aTj9/0WTeMLnEsEt0h6i7gI23lWp0OhJ6nIFDUI4?= =?us-ascii?Q?KUoHU+HddrxwSLHqfD4tKBxodJc0W2xVd1FYeMeDcU+QvStGfvKWNRxWcsBB?= =?us-ascii?Q?raOcbiNrebd/MWWoLVX2S5QWZ7zRWuEmhaUjGFR/tyQ50IVxDpfgzBOjJb+c?= =?us-ascii?Q?GvXS/X0skZegGAqK/ri4UjpyF9b0fr+45jOn3QPvhMbTSwbztjt3CEU4g2ZT?= =?us-ascii?Q?ryon8qD7+iSIoiSpVR/dSW+I9dVpdIlQ6JarFMPvY6ih9r4s4U52iG3epDns?= =?us-ascii?Q?bHny8wFoyt3PdtzDbvnuEHKzBopfzOv6t9HPNarbyUd8tPTkBWEJFvZHXgsM?= =?us-ascii?Q?yu3IUDn/SgCRN6ttmh/KtoScVCPRVfodd5YL/QJaxroCi8a8HXeDM4bT3f/z?= =?us-ascii?Q?Qka3owShd1j1X0lPAboQX0hVzQxeAFlJeushlng/eniQS16l89/zpkWjZHYw?= =?us-ascii?Q?T24B03rdnKajBHt77i2kjMmzDkPtKUFx88iDCGF43mhE5zBGe9tmBVheVCBa?= =?us-ascii?Q?BoLrGtSDwx/8H3JUm1Knw6mwbKO6cBD+Qat7nwQJ93ehpb4mkfiEfbYYniPN?= =?us-ascii?Q?GXaBrjf7BBSICw/lhFZTUjSA4GCiS26XO7vpg7fco6qVkMO7Dm2gc+xynii0?= =?us-ascii?Q?jsV53hw7l72bUYXM2RMnm1PBMh0kGnqc+9iuHwIzjg84U/ZOrgqOevumSoCE?= =?us-ascii?Q?o2xc7v4Y9sgbG4lyeGp7ug6R2Dtsbuin3gg/sBTGiktmP9CVuwMituBhr1O/?= =?us-ascii?Q?bpIfjq2GQaBo0ORa9rINfOTtd/9aL+4YqJbngjByZX2wsePXvtfNCFmZIdCu?= =?us-ascii?Q?Vcco/5yd5njmVDCsjYPu4SMRrAtvMd6cRCPDegvc3pMm9hskuRnqQrxB7LXR?= =?us-ascii?Q?Q2Kf23yA9FhONtwsabFE07PkGS2zkxiI6vs6IT0qTxZc7HKt3YBYIW1Pxjab?= =?us-ascii?Q?DAKN6/DQ9dpcWmpLrAVqCwM7nbA+zgmiqLZYntcxcMw1FajgKpKuBzF2N5hi?= =?us-ascii?Q?FAoxWqZDYfDoAzvkYfqxEmlI2Dm5sE3w1weNJMbi1hnkJZTv9uV6SNMZpQVe?= =?us-ascii?Q?W5HcGBwa+zWRFAphpZLA=3D?= X-Microsoft-Antispam-Message-Info: 891H2ss0z3m/fnYUpdd7C5vy+TpL/1d2FlnRyIvsG4dboA74hisaBG8TR3SYzfKAlIPbWkohs9sU9PIQfkNcQGE0+8cwN2A5g+sxNe5xhgsBSvvxTR3pXV7Rj8o+jlbU4hkWy17POdU0DkzRUDVlaWUCl3kiSNhN80lT2b+7UpPgQheksUi3t4Yql84J/UJ7 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2926; 6:B6LmzN2zzkFjQk0yTrkzArEIFSNYOCeNguXWkbEp++jtvsXhhHhoOLK/KF4voYGVr4azaIx9O01YyZ+xiE5Ma4xMjLchfdbU1TOslXq6HsjuFkl5qQZ3e1ByI+OAURS7BMuwEeWDXY8YJXMwyUfc2bv70fbtK4DjAtb8waYxOc0Hk+VpbsDL5DUdrO9PA+sdxZJq3Obso5nCh4Wq2h5ogiiDcaoBxdKmW0UtuARMWtWt1ylVF/pKSOnYO5BIeIuwgd9Ft+O1CIGqJjwDEbiqnvUaD6wbo+VnD3Kc0+vrKsHDX2k1xQif2ML4SK1UbWMWDAR4p7RtW+nTAZK5XyYi3vPUkM1Jl6UDKW/mDN6EIe0YjgkJJGdvDYFGBuVp7hzPixZNnfQ8nhLvnumLUsG7uMWMJLzunQiZWiKZJ1VHbwHzA4nf174I6pm+6dvJabTnJRPdTRxcvMIEwLkUibC3VA==; 5:iEHrpW0De0xddxZo4n6W35cr5JC9Cn5LsVbzITQUMTpcsewGrb+Cfs+MLzw89g5mheUNSPQfBAgXZyvOgwTGXbQYKWRyBAws6jz2a7iGC3K/OrSi8r0h93CKLqWvU5e/fXtmP7E5JsVVDgGb/GutVArP721fkThiXkhbuLtlil0=; 24:TdMC6mO69CwGe7AdhfGH+LA4+8633nuStJnUngyP1IRAf4BpGyvK9VMuVgOw2G7dyRhxXoT4jBjOPh+5GfM1F7/KEvpsjrhjwr+ZqC3KuLY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2926; 7:BJiPkmw0MEU6anQsRxKu1qZ5oj8KgoxMAPnbgNQLvYF3fYCz2vNIw1N127ahUSNoqI7sQFoK9XUGcJolroIKJeaBkHm8pcebaOPBklotmzVnv+gHyTOwK9NsuwxbvP+80bTgvKyJNWmnM1m8Tpnl2Q4kPssmVpplOw/N/A2DDqNz+6de9OEdZn7rR0ikVKplGgvhnoTP+KiAcnuL9u/z02L3cpp22/clVMZDdjfasW5vdb3v7MQurcY0kT9KGVxk X-MS-Office365-Filtering-Correlation-Id: e453f879-b408-44f2-8b67-08d5c1652ea7 X-OriginatorOrg: tandemg.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 10:57:45.7320 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e453f879-b408-44f2-8b67-08d5c1652ea7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d690b55a-f04a-454b-9f62-fb1e25467a25 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2926 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: <backports.vger.kernel.org> X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/backport/compat/backport-4.12.c b/backport/compat/backport-4.12.c index 2372a11..4948b53 100644 --- a/backport/compat/backport-4.12.c +++ b/backport/compat/backport-4.12.c @@ -225,6 +225,13 @@ int bp_extack_genl_register_family(struct genl_family *family) /* copy this since the family might access it directly */ family->id = copy->family.id; family->attrbuf = copy->family.attrbuf; + + /* family ID from the original family struct will be used when building + * genl messages (sent as nlmsg_type), so the new id should be updated + * in the original (older kernel format) family struct too + */ + family->family.id = copy->family.id; + #if LINUX_VERSION_IS_GEQ(3,13,0) family->mcgrp_offset = copy->family.mcgrp_offset; #endif
Family ID from the original family struct will be used when building genl messages (sent as nlmsg_type), so the new id should be updated in the original (older kernel format) family struct too Signed-off-by: Aaron Komisar <aaron.komisar@tandemg.com> --- backport/compat/backport-4.12.c | 7 +++++++ 1 file changed, 7 insertions(+)