From patchwork Mon Aug 17 15:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 265995 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=-12.8 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=unavailable 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 C80F7C433E4 for ; Mon, 17 Aug 2020 19:27:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4D38204EC for ; Mon, 17 Aug 2020 19:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597692458; bh=nrJEqP40ZR2hqulL9zfKStqb14ZXK7kIm751aLXO3kM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CMgBjmzs6dcglM2WBrDx4GNNM0XZqL0KEgVFVi8VeE8xSPatXna04/lACw8iuqFG6 6CeLMGfxhrsdG7wy3uHz+F8HWueeVwpGhPL/v+b/Hypihr6z+cyLLyaVkdmuWpTW7I PTeMxMEkDh4xevnGIhYiURDCHW/nHb7crv6hsPRk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730177AbgHQT1S (ORCPT ); Mon, 17 Aug 2020 15:27:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:35404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730370AbgHQPdV (ORCPT ); Mon, 17 Aug 2020 11:33:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 D4655208E4; Mon, 17 Aug 2020 15:33:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678400; bh=nrJEqP40ZR2hqulL9zfKStqb14ZXK7kIm751aLXO3kM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tvqd6Sc9l29Hmw3z0SIMI0Qhurx3iaNQ6s6EILEb3ZEuvW61BfAc/Vf4l3bZuhhPU 7m7v2NpulzUOPJGf0h4vYujph2Nn37M/E7MD27qV/1vAkaHY8ebw/40eRo9zQC6W7v 12og5lin5gReIae9Nv+rzGDX05KKOkpJ0tlTtQsQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Packham , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.8 291/464] net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration Date: Mon, 17 Aug 2020 17:14:04 +0200 Message-Id: <20200817143847.693087057@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@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: Chris Packham [ Upstream commit 0f3c66a3c7b4e8b9f654b3c998e9674376a51b0f ] The MV88E6097 chip does not support configuring jumbo frames. Prior to commit 5f4366660d65 only the 6352, 6351, 6165 and 6320 chips configured jumbo mode. The refactor accidentally added the function for the 6097. Remove the erroneous function pointer assignment. Fixes: 5f4366660d65 ("net: dsa: mv88e6xxx: Refactor setting of jumbo frames") Signed-off-by: Chris Packham Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/chip.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index fee16c947c2e8..359043659327e 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3485,7 +3485,6 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods, .port_set_ether_type = mv88e6351_port_set_ether_type, - .port_set_jumbo_size = mv88e6165_port_set_jumbo_size, .port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting, .port_pause_limit = mv88e6097_port_pause_limit, .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,