From patchwork Mon Aug 21 22:28:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9913883 Return-Path: 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 5FA09608A6 for ; Mon, 21 Aug 2017 22:28:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F51F286AA for ; Mon, 21 Aug 2017 22:28:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34395286B8; Mon, 21 Aug 2017 22:28:44 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 D2579286C1 for ; Mon, 21 Aug 2017 22:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049AbdHUW2n (ORCPT ); Mon, 21 Aug 2017 18:28:43 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:42922 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754035AbdHUW2m (ORCPT ); Mon, 21 Aug 2017 18:28:42 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id E108D469EA; Tue, 22 Aug 2017 00:28:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id zUmz21eG5v_6; Tue, 22 Aug 2017 00:28:39 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 04/21] header: skbuff: fix signature of skb_put(), skb_push() and () Date: Tue, 22 Aug 2017 00:28:00 +0200 Message-Id: <20170821222817.17376-5-hauke@hauke-m.de> In-Reply-To: <20170821222817.17376-1-hauke@hauke-m.de> References: <20170821222817.17376-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In older kernel versions these functions returned a unsigned char*, now they return a void *. This change was done in upstream commit d58ff35122847a8 ("networking: make skb_push & __skb_push return void pointers") Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/skbuff.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 09894a96..61f3b98f 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -316,6 +316,24 @@ __u32 skb_get_hash_perturb(const struct sk_buff *skb, u32 perturb) #endif #if LINUX_VERSION_IS_LESS(4,13,0) +static inline void *backport_skb_put(struct sk_buff *skb, unsigned int len) +{ + return skb_put(skb, len); +} +#define skb_put LINUX_BACKPORT(skb_put) + +static inline void *backport_skb_push(struct sk_buff *skb, unsigned int len) +{ + return skb_push(skb, len); +} +#define skb_push LINUX_BACKPORT(skb_push) + +static inline void *backport___skb_push(struct sk_buff *skb, unsigned int len) +{ + return __skb_push(skb, len); +} +#define __skb_push LINUX_BACKPORT(__skb_push) + static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) { void *tmp = skb_put(skb, len);