From patchwork Wed Oct 25 04:55:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subash Abhinov Kasiviswanathan X-Patchwork-Id: 830091 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="ZF3mOrIE"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Lco3b47a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMHsF6l58z9t16 for ; Wed, 25 Oct 2017 15:56:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751922AbdJYEzy (ORCPT ); Wed, 25 Oct 2017 00:55:54 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43296 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751289AbdJYEzt (ORCPT ); Wed, 25 Oct 2017 00:55:49 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 63FE0607B4; Wed, 25 Oct 2017 04:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1508907349; bh=NjuLEMOmsLPqjtwIoDM9r0Ob77mdY4f8lsRcd12mDYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZF3mOrIECBTpWLUi1VCDRJfT7yeNaNLqVjuwaOGlsc/izXyRelQuI/EfZTSWIRc0K Bxw1tO1yIa1IWEygaEJgZe+i6WxEvXWYhdz/K4GQhzxaRW/IjY6M6OjBQaphLYP09x Svj9D64T7CrJn8Edvx6fUbZYjRXQnmdtekRET1xQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from subashab-lnx.qualcomm.com (unknown [129.46.15.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: subashab@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8951F6034E; Wed, 25 Oct 2017 04:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1508907348; bh=NjuLEMOmsLPqjtwIoDM9r0Ob77mdY4f8lsRcd12mDYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lco3b47aFpLpFrw4X43DZqMkLgbgK18+gBXd1TWHtz3Pm6zirXFQVqHHoyzQZWR1n QMinXVukwC3M52P9M+rinS0rVgursm8C4rbSvPkvJEUyn9j+l/3M4TwP1d2z5Cm+kM Fm/gvLP2BbVG3+N6HnG/N32A16U9tT1Q/P6EDzJ8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8951F6034E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=subashab@codeaurora.org From: Subash Abhinov Kasiviswanathan To: davem@davemloft.net, netdev@vger.kernel.org Cc: Subash Abhinov Kasiviswanathan Subject: [PATCH net-next 2/4] net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path Date: Tue, 24 Oct 2017 22:55:27 -0600 Message-Id: <1508907329-1077-3-git-send-email-subashab@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508907329-1077-1-git-send-email-subashab@codeaurora.org> References: <1508907329-1077-1-git-send-email-subashab@codeaurora.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The rmnet device needs to assigned for all packets in the deaggregation path based on the mux id, so the check is not needed. Signed-off-by: Subash Abhinov Kasiviswanathan --- drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c index 5dd186d..1ea9783 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c @@ -83,8 +83,7 @@ static void rmnet_set_skb_proto(struct sk_buff *skb) if (!ep) goto free_skb; - if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEMUXING) - skb->dev = ep->egress_dev; + skb->dev = ep->egress_dev; /* Subtract MAP header */ skb_pull(skb, sizeof(struct rmnet_map_header));