From patchwork Tue Sep 15 14:12:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37C12C43461 for ; Wed, 16 Sep 2020 00:10:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF27120739 for ; Wed, 16 Sep 2020 00:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600215014; bh=oAQs44u1zUPWlrnad2tUoyXptQENSkio0WetpFVO03U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JEW29uSlshHhs1jEIVxCThHBC5qsUIfqV4y0RCyoj5+LmWEeR9xIuYx7lfIkmV4NU J4xXbKq2KZ9I3xWVRv6tDo67PD98sbQjGyt5Ajvi0n6I1c2askl07Icw9mYYmpTFUU Kp1dzCkUiLRllbz5kZlV/321ackKgncYPU53JLBQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726907AbgIPAKM (ORCPT ); Tue, 15 Sep 2020 20:10:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:38264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726879AbgIOO0u (ORCPT ); Tue, 15 Sep 2020 10:26:50 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08F0722475; Tue, 15 Sep 2020 14:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179585; bh=oAQs44u1zUPWlrnad2tUoyXptQENSkio0WetpFVO03U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z0ilpehUt+5Wat0zAGBn/Tsj0HxoHsTErLcrRqITITebGMo756QZ9qVEpLBJ1U69R AClxHQNz4TYLhp1j5RU3ZEih93CExvLPBmFDzcI2Dg/p0775sBFGbjfZ5fIXOtFZkn 1yjKONqZVAW6ZC391XO/f8Nez1InWi/U7yUY6aTY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Willem de Bruijn , Martin Schiller , Xie He , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 039/132] drivers/net/wan/lapbether: Added needed_tailroom Date: Tue, 15 Sep 2020 16:12:21 +0200 Message-Id: <20200915140646.078196410@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140644.037604909@linuxfoundation.org> References: <20200915140644.037604909@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xie He [ Upstream commit 1ee39c1448c4e0d480c5b390e2db1987561fb5c2 ] The underlying Ethernet device may request necessary tailroom to be allocated by setting needed_tailroom. This driver should also set needed_tailroom to request the tailroom needed by the underlying Ethernet device to be allocated. Cc: Willem de Bruijn Cc: Martin Schiller Signed-off-by: Xie He Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/wan/lapbether.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 996eb9c55b39a..373c9ce4010a3 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -340,6 +340,7 @@ static int lapbeth_new_device(struct net_device *dev) */ ndev->needed_headroom = -1 + 3 + 2 + dev->hard_header_len + dev->needed_headroom; + ndev->needed_tailroom = dev->needed_tailroom; lapbeth = netdev_priv(ndev); lapbeth->axdev = ndev;