From patchwork Mon Sep 26 11:08:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 675096 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sjLqS0Smqz9s5g for ; Mon, 26 Sep 2016 21:10:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030356AbcIZLKO (ORCPT ); Mon, 26 Sep 2016 07:10:14 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:63167 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965074AbcIZLIa (ORCPT ); Mon, 26 Sep 2016 07:08:30 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.38.120]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0MPdgn-1bscVQ428v-004g3J; Mon, 26 Sep 2016 13:08:22 +0200 From: Stefan Wahren To: "David S. Miller" , Greg Kroah-Hartman , Jiri Slaby Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH RFC v2 net-next 5/8] net: qualcomm: move MTU handling to qca_common Date: Mon, 26 Sep 2016 13:08:03 +0200 Message-Id: <1474888086-514-6-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> References: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:x3Go+MzOo/PWbiu9DBc6f4jeGb/rNzgTLe66Q9TFlKMT3DkRQU6 FJ1P2AsHv4Kf2wcbCUeYNs/eVxTcxnUqj/H8KP4B0ZtRsKaqdwaMio3LvuWx0tbTC593+NX 8Df4ldHm56bQvlKvn4uwL7WeikefHOLZB4BOv0wRyPHFskRX/F/TssqXxDom5ETX29gRiKy ZHmqrneKAvv1J5sRrfpiw== X-UI-Out-Filterresults: notjunk:1; V01:K0:84w/Jes1QEw=:2uS85B6wfHIWio/9mj7uEQ ClY9ipBPb3GG1WIVRp4JJ9MVW5HkDbHoj9Ktu3WPmaaZNn6mf66+NxlyCQO9ftOwrIS2HewJL r2bBK+rodP6WY73aTHTLkErwM/EL6dScgomFnYIh6AL5bbHVHiCK8UD+eK5Uqq26mTxeRsvNr 2mND3tYpEwnXuwzLGPigujQ6cOLOXyxhbUuYM3jdalp3Zu6XCkybpGjyE3GdcPeBkXjtoY368 x2gwfhV+lF5qtlHpjm60pjf88yzmuHMjN9BjfIAfGwTyLfwdg0WEOiSgj1J7qTHXq07n3HBVM XJd2PCq+bEOrNweeetgfGOypbUFsQsB2CPYDK5ghGp6lw3R34glsYhFCCXBQhu1MbY3yGP/Ii lnCOGuy/iVgZhQsB2AQ5Yvk0Y+AKSqPFwRCjaEpFnmOe5BbXdYiKj15zn3mHtrkaiJVe3VzAW 1dyBt8o3Gv1cL0j7ACHUKHEG5hI7NMue+SrTj3KtKRGOUSJPlW5JzJod8nYq3FjNgnVzbHip0 jHinIqQg9RWTivY4c6ufx/WSFVDMD8XmPmJcXjL9TSWUXpeEMsYPlNGGcIr+JLLa5AjcnU+pf ftM12mvQ7rwSavvYpTB4uv2Pulo/G4JLARFPHPa2rC0/NUz2IvzYEy2O+IWq2aT09HG2LTQ66 7LkKR8TWi43z0vYKYBwVVVWB/X51daVvtfiOQLcvX6DQbro4Xyx+WE0oLGWR0r8u4UAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MTU of the QCA7000 is independent from it's host interface (UART,SPI). So move the change_mtu function to qca_common. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_common.c | 11 +++++++++++ drivers/net/ethernet/qualcomm/qca_common.h | 3 +++ drivers/net/ethernet/qualcomm/qca_spi.c | 13 +------------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/qca_common.c b/drivers/net/ethernet/qualcomm/qca_common.c index 26453a9..9020c57 100644 --- a/drivers/net/ethernet/qualcomm/qca_common.c +++ b/drivers/net/ethernet/qualcomm/qca_common.c @@ -154,3 +154,14 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by return ret; } + +int +qcacmn_netdev_change_mtu(struct net_device *dev, int new_mtu) +{ + if ((new_mtu < QCAFRM_ETHMINMTU) || (new_mtu > QCAFRM_ETHMAXMTU)) + return -EINVAL; + + dev->mtu = new_mtu; + + return 0; +} diff --git a/drivers/net/ethernet/qualcomm/qca_common.h b/drivers/net/ethernet/qualcomm/qca_common.h index 8c9b713..0fafaaf 100644 --- a/drivers/net/ethernet/qualcomm/qca_common.h +++ b/drivers/net/ethernet/qualcomm/qca_common.h @@ -26,6 +26,7 @@ #include #include +#include #include /* Frame is currently being received */ @@ -131,4 +132,6 @@ static inline void qcafrm_fsm_init(struct qcafrm_handle *handle) s32 qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_byte); +int qcacmn_netdev_change_mtu(struct net_device *dev, int new_mtu); + #endif /* _QCA_COMMON_H */ diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 551591d..e0a5020 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -804,24 +804,13 @@ qcaspi_netdev_uninit(struct net_device *dev) dev_kfree_skb(qca->rx_skb); } -static int -qcaspi_netdev_change_mtu(struct net_device *dev, int new_mtu) -{ - if ((new_mtu < QCAFRM_ETHMINMTU) || (new_mtu > QCAFRM_ETHMAXMTU)) - return -EINVAL; - - dev->mtu = new_mtu; - - return 0; -} - static const struct net_device_ops qcaspi_netdev_ops = { .ndo_init = qcaspi_netdev_init, .ndo_uninit = qcaspi_netdev_uninit, .ndo_open = qcaspi_netdev_open, .ndo_stop = qcaspi_netdev_close, .ndo_start_xmit = qcaspi_netdev_xmit, - .ndo_change_mtu = qcaspi_netdev_change_mtu, + .ndo_change_mtu = qcacmn_netdev_change_mtu, .ndo_set_mac_address = eth_mac_addr, .ndo_tx_timeout = qcaspi_netdev_tx_timeout, .ndo_validate_addr = eth_validate_addr,