Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/809223/?format=api
{ "id": 809223, "url": "http://patchwork.ozlabs.org/api/patches/809223/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1504416646-9527-7-git-send-email-subashab@codeaurora.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504416646-9527-7-git-send-email-subashab@codeaurora.org>", "list_archive_url": null, "date": "2017-09-03T05:30:46", "name": "[net-next,6/6] net: qualcomm: rmnet: Rename real_dev_info to port", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c9498bf4c722afcc7b11fe6c41111c50cd9e5022", "submitter": { "id": 65547, "url": "http://patchwork.ozlabs.org/api/people/65547/?format=api", "name": "Subash Abhinov Kasiviswanathan", "email": "subashab@codeaurora.org" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1504416646-9527-7-git-send-email-subashab@codeaurora.org/mbox/", "series": [ { "id": 1198, "url": "http://patchwork.ozlabs.org/api/series/1198/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1198", "date": "2017-09-03T05:30:40", "name": "net: qualcomm: rmnet: Fix comments on initial patchset", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1198/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809223/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809223/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=codeaurora.org header.i=@codeaurora.org\n\theader.b=\"lQBnrf7c\"; \n\tdkim=pass (1024-bit key) header.d=codeaurora.org\n\theader.i=@codeaurora.org header.b=\"dWUNCAKO\"; \n\tdkim-atps=neutral", "pdx-caf-mail.web.codeaurora.org;\n\tdmarc=none (p=none dis=none)\n\theader.from=codeaurora.org", "pdx-caf-mail.web.codeaurora.org;\n\tspf=none smtp.mailfrom=subashab@codeaurora.org" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlM6w2Ccmz9sPk\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 3 Sep 2017 15:32:08 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751517AbdICFcD (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 3 Sep 2017 01:32:03 -0400", "from smtp.codeaurora.org ([198.145.29.96]:42882 \"EHLO\n\tsmtp.codeaurora.org\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751159AbdICFcA (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sun, 3 Sep 2017 01:32:00 -0400", "by smtp.codeaurora.org (Postfix, from userid 1000)\n\tid B01DF608D4; Sun, 3 Sep 2017 05:31:59 +0000 (UTC)", "from subashab-lnx.qualcomm.com (unknown [129.46.15.92])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\t(Authenticated sender: subashab@codeaurora.org)\n\tby smtp.codeaurora.org (Postfix) with ESMTPSA id 9990E60A52;\n\tSun, 3 Sep 2017 05:31:57 +0000 (UTC)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org;\n\ts=default; t=1504416719;\n\tbh=Vm6aPaX7wonlMk+txCJgvahcuFE7bCd7bVteiAy3cfo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lQBnrf7cIcbkFRwFgfsLENHe0tvFqwk/w1FFgHW6PFJOhlViLRw5Eb+mEztKHpzDd\n\tT0PK2KvhfF557DQIk4U9yhkFyub2+EoJkaABgWmG2tBtvv0Rqd2jjCGle4nNdG7ji1\n\t6qW6RucRmfi69+bbUBE9c5aZnNuFX/xwrJs1CXv0=", "v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org;\n\ts=default; t=1504416718;\n\tbh=Vm6aPaX7wonlMk+txCJgvahcuFE7bCd7bVteiAy3cfo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dWUNCAKOFvFKJ4YSoFRJIYSbFdB4GCpjBRocCQ9cGKKGT8qPUgi0wrnpuFDFz5k3V\n\tKwkRUOTY6ofT99XcUT8pXHCPOXfkvRH+3s80oyktK1EdatCQaNVHnNq3bEXo+vCUSj\n\t4g5Z+PtZX/s3lGnHY01MVvXUI8tKrTzhcGOrwTaQ=" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on\n\tpdx-caf-mail.web.codeaurora.org", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00,\n\tDKIM_SIGNED,\n\tT_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0", "DMARC-Filter": "OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9990E60A52", "From": "Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>", "To": "netdev@vger.kernel.org, davem@davemloft.net", "Cc": "Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>,\n\tDan Williams <dcbw@redhat.com>", "Subject": "[PATCH net-next 6/6] net: qualcomm: rmnet: Rename real_dev_info to\n\tport", "Date": "Sat, 2 Sep 2017 23:30:46 -0600", "Message-Id": "<1504416646-9527-7-git-send-email-subashab@codeaurora.org>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1504416646-9527-1-git-send-email-subashab@codeaurora.org>", "References": "<1504416646-9527-1-git-send-email-subashab@codeaurora.org>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Make it similar to drivers like ipvlan / macvlan so it is easier to read.\n\nSigned-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>\nCc: Dan Williams <dcbw@redhat.com>\n---\n drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 65 +++++++++++-----------\n drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 5 +-\n .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 56 +++++++++----------\n drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 6 +-\n .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 13 ++---\n .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 3 +-\n drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 17 +++---\n drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 4 +-\n 8 files changed, 82 insertions(+), 87 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c\nindex 6f21cd0..98f2255 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c\n@@ -46,7 +46,7 @@\n struct rmnet_walk_data {\n \tstruct net_device *real_dev;\n \tstruct list_head *head;\n-\tstruct rmnet_real_dev_info *real_dev_info;\n+\tstruct rmnet_port *port;\n };\n \n static int rmnet_is_real_dev_registered(const struct net_device *real_dev)\n@@ -58,8 +58,8 @@ static int rmnet_is_real_dev_registered(const struct net_device *real_dev)\n }\n \n /* Needs rtnl lock */\n-static struct rmnet_real_dev_info*\n-rmnet_get_real_dev_info_rtnl(const struct net_device *real_dev)\n+static struct rmnet_port*\n+rmnet_get_port_rtnl(const struct net_device *real_dev)\n {\n \treturn rtnl_dereference(real_dev->rx_handler_data);\n }\n@@ -67,27 +67,27 @@ static int rmnet_is_real_dev_registered(const struct net_device *real_dev)\n static struct rmnet_endpoint*\n rmnet_get_endpoint(struct net_device *dev, int config_id)\n {\n-\tstruct rmnet_real_dev_info *r;\n \tstruct rmnet_endpoint *ep;\n+\tstruct rmnet_port *port;\n \n \tif (!rmnet_is_real_dev_registered(dev)) {\n \t\tep = rmnet_vnd_get_endpoint(dev);\n \t} else {\n-\t\tr = rmnet_get_real_dev_info_rtnl(dev);\n+\t\tport = rmnet_get_port_rtnl(dev);\n \n-\t\tep = &r->muxed_ep[config_id];\n+\t\tep = &port->muxed_ep[config_id];\n \t}\n \n \treturn ep;\n }\n \n static int rmnet_unregister_real_device(struct net_device *real_dev,\n-\t\t\t\t\tstruct rmnet_real_dev_info *r)\n+\t\t\t\t\tstruct rmnet_port *port)\n {\n-\tif (r->nr_rmnet_devs)\n+\tif (port->nr_rmnet_devs)\n \t\treturn -EINVAL;\n \n-\tkfree(r);\n+\tkfree(port);\n \n \tnetdev_rx_handler_unregister(real_dev);\n \n@@ -100,7 +100,7 @@ static int rmnet_unregister_real_device(struct net_device *real_dev,\n \n static int rmnet_register_real_device(struct net_device *real_dev)\n {\n-\tstruct rmnet_real_dev_info *r;\n+\tstruct rmnet_port *port;\n \tint rc;\n \n \tASSERT_RTNL();\n@@ -108,14 +108,14 @@ static int rmnet_register_real_device(struct net_device *real_dev)\n \tif (rmnet_is_real_dev_registered(real_dev))\n \t\treturn 0;\n \n-\tr = kzalloc(sizeof(*r), GFP_ATOMIC);\n-\tif (!r)\n+\tport = kzalloc(sizeof(*port), GFP_ATOMIC);\n+\tif (!port)\n \t\treturn -ENOMEM;\n \n-\tr->dev = real_dev;\n-\trc = netdev_rx_handler_register(real_dev, rmnet_rx_handler, r);\n+\tport->dev = real_dev;\n+\trc = netdev_rx_handler_register(real_dev, rmnet_rx_handler, port);\n \tif (rc) {\n-\t\tkfree(r);\n+\t\tkfree(port);\n \t\treturn -EBUSY;\n \t}\n \n@@ -154,9 +154,9 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,\n \t\t\t RMNET_INGRESS_FORMAT_MAP;\n \tint egress_format = RMNET_EGRESS_FORMAT_MUXING |\n \t\t\t RMNET_EGRESS_FORMAT_MAP;\n-\tstruct rmnet_real_dev_info *r;\n \tstruct net_device *real_dev;\n \tint mode = RMNET_EPMODE_VND;\n+\tstruct rmnet_port *port;\n \tint err = 0;\n \tu16 mux_id;\n \n@@ -173,8 +173,8 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,\n \tif (err)\n \t\tgoto err0;\n \n-\tr = rmnet_get_real_dev_info_rtnl(real_dev);\n-\terr = rmnet_vnd_newlink(mux_id, dev, r, real_dev);\n+\tport = rmnet_get_port_rtnl(real_dev);\n+\terr = rmnet_vnd_newlink(mux_id, dev, port, real_dev);\n \tif (err)\n \t\tgoto err1;\n \n@@ -184,25 +184,25 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev,\n \n \tnetdev_dbg(dev, \"data format [ingress 0x%08X] [egress 0x%08X]\\n\",\n \t\t ingress_format, egress_format);\n-\tr->egress_data_format = egress_format;\n-\tr->ingress_data_format = ingress_format;\n+\tport->egress_data_format = egress_format;\n+\tport->ingress_data_format = ingress_format;\n \n \trmnet_set_endpoint_config(real_dev, mux_id, mode, dev);\n \trmnet_set_endpoint_config(dev, mux_id, mode, real_dev);\n \treturn 0;\n \n err2:\n-\trmnet_vnd_dellink(mux_id, r);\n+\trmnet_vnd_dellink(mux_id, port);\n err1:\n-\trmnet_unregister_real_device(real_dev, r);\n+\trmnet_unregister_real_device(real_dev, port);\n err0:\n \treturn err;\n }\n \n static void rmnet_dellink(struct net_device *dev, struct list_head *head)\n {\n-\tstruct rmnet_real_dev_info *r;\n \tstruct net_device *real_dev;\n+\tstruct rmnet_port *port;\n \tu8 mux_id;\n \n \trcu_read_lock();\n@@ -212,12 +212,12 @@ static void rmnet_dellink(struct net_device *dev, struct list_head *head)\n \tif (!real_dev || !rmnet_is_real_dev_registered(real_dev))\n \t\treturn;\n \n-\tr = rmnet_get_real_dev_info_rtnl(real_dev);\n+\tport = rmnet_get_port_rtnl(real_dev);\n \n \tmux_id = rmnet_vnd_get_mux(dev);\n-\trmnet_vnd_dellink(mux_id, r);\n+\trmnet_vnd_dellink(mux_id, port);\n \tnetdev_upper_dev_unlink(dev, real_dev);\n-\trmnet_unregister_real_device(real_dev, r);\n+\trmnet_unregister_real_device(real_dev, port);\n \n \tunregister_netdevice_queue(dev, head);\n }\n@@ -229,7 +229,7 @@ static int rmnet_dev_walk_unreg(struct net_device *rmnet_dev, void *data)\n \n \tmux_id = rmnet_vnd_get_mux(rmnet_dev);\n \n-\trmnet_vnd_dellink(mux_id, d->real_dev_info);\n+\trmnet_vnd_dellink(mux_id, d->port);\n \tnetdev_upper_dev_unlink(rmnet_dev, d->real_dev);\n \tunregister_netdevice_queue(rmnet_dev, d->head);\n \n@@ -239,8 +239,8 @@ static int rmnet_dev_walk_unreg(struct net_device *rmnet_dev, void *data)\n static void rmnet_force_unassociate_device(struct net_device *dev)\n {\n \tstruct net_device *real_dev = dev;\n-\tstruct rmnet_real_dev_info *r;\n \tstruct rmnet_walk_data d;\n+\tstruct rmnet_port *port;\n \tLIST_HEAD(list);\n \n \tif (!rmnet_is_real_dev_registered(real_dev))\n@@ -251,15 +251,15 @@ static void rmnet_force_unassociate_device(struct net_device *dev)\n \td.real_dev = real_dev;\n \td.head = &list;\n \n-\tr = rmnet_get_real_dev_info_rtnl(dev);\n-\td.real_dev_info = r;\n+\tport = rmnet_get_port_rtnl(dev);\n+\td.port = port;\n \n \trcu_read_lock();\n \tnetdev_walk_all_lower_dev_rcu(real_dev, rmnet_dev_walk_unreg, &d);\n \trcu_read_unlock();\n \tunregister_netdevice_many(&list);\n \n-\trmnet_unregister_real_device(real_dev, r);\n+\trmnet_unregister_real_device(real_dev, port);\n }\n \n static int rmnet_config_notify_cb(struct notifier_block *nb,\n@@ -319,8 +319,7 @@ struct rtnl_link_ops rmnet_link_ops __read_mostly = {\n };\n \n /* Needs either rcu_read_lock() or rtnl lock */\n-struct rmnet_real_dev_info*\n-rmnet_get_real_dev_info(struct net_device *real_dev)\n+struct rmnet_port *rmnet_get_port(struct net_device *real_dev)\n {\n \tif (rmnet_is_real_dev_registered(real_dev))\n \t\treturn rcu_dereference_rtnl(real_dev->rx_handler_data);\ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h\nindex 3212b25..dde4e9f 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h\n@@ -32,7 +32,7 @@ struct rmnet_endpoint {\n /* One instance of this structure is instantiated for each real_dev associated\n * with rmnet.\n */\n-struct rmnet_real_dev_info {\n+struct rmnet_port {\n \tstruct net_device *dev;\n \tstruct rmnet_endpoint local_ep;\n \tstruct rmnet_endpoint muxed_ep[RMNET_MAX_LOGICAL_EP];\n@@ -50,7 +50,6 @@ struct rmnet_priv {\n \tstruct net_device *real_dev;\n };\n \n-struct rmnet_real_dev_info*\n-rmnet_get_real_dev_info(struct net_device *real_dev);\n+struct rmnet_port *rmnet_get_port(struct net_device *real_dev);\n \n #endif /* _RMNET_CONFIG_H_ */\ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c\nindex 7dab3bb..540c762 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c\n@@ -82,32 +82,32 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)\n \n static rx_handler_result_t\n rmnet_ingress_deliver_packet(struct sk_buff *skb,\n-\t\t\t struct rmnet_real_dev_info *r)\n+\t\t\t struct rmnet_port *port)\n {\n-\tif (!r) {\n+\tif (!port) {\n \t\tkfree_skb(skb);\n \t\treturn RX_HANDLER_CONSUMED;\n \t}\n \n-\tskb->dev = r->local_ep.egress_dev;\n+\tskb->dev = port->local_ep.egress_dev;\n \n-\treturn rmnet_deliver_skb(skb, &r->local_ep);\n+\treturn rmnet_deliver_skb(skb, &port->local_ep);\n }\n \n /* MAP handler */\n \n static rx_handler_result_t\n __rmnet_map_ingress_handler(struct sk_buff *skb,\n-\t\t\t struct rmnet_real_dev_info *r)\n+\t\t\t struct rmnet_port *port)\n {\n \tstruct rmnet_endpoint *ep;\n \tu8 mux_id;\n \tu16 len;\n \n \tif (RMNET_MAP_GET_CD_BIT(skb)) {\n-\t\tif (r->ingress_data_format\n+\t\tif (port->ingress_data_format\n \t\t & RMNET_INGRESS_FORMAT_MAP_COMMANDS)\n-\t\t\treturn rmnet_map_command(skb, r);\n+\t\t\treturn rmnet_map_command(skb, port);\n \n \t\tkfree_skb(skb);\n \t\treturn RX_HANDLER_CONSUMED;\n@@ -121,9 +121,9 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)\n \t\treturn RX_HANDLER_CONSUMED;\n \t}\n \n-\tep = &r->muxed_ep[mux_id];\n+\tep = &port->muxed_ep[mux_id];\n \n-\tif (r->ingress_data_format & RMNET_INGRESS_FORMAT_DEMUXING)\n+\tif (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEMUXING)\n \t\tskb->dev = ep->egress_dev;\n \n \t/* Subtract MAP header */\n@@ -135,26 +135,26 @@ static void rmnet_set_skb_proto(struct sk_buff *skb)\n \n static rx_handler_result_t\n rmnet_map_ingress_handler(struct sk_buff *skb,\n-\t\t\t struct rmnet_real_dev_info *r)\n+\t\t\t struct rmnet_port *port)\n {\n \tstruct sk_buff *skbn;\n \tint rc;\n \n-\tif (r->ingress_data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {\n-\t\twhile ((skbn = rmnet_map_deaggregate(skb, r)) != NULL)\n-\t\t\t__rmnet_map_ingress_handler(skbn, r);\n+\tif (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEAGGREGATION) {\n+\t\twhile ((skbn = rmnet_map_deaggregate(skb)) != NULL)\n+\t\t\t__rmnet_map_ingress_handler(skbn, port);\n \n \t\tconsume_skb(skb);\n \t\trc = RX_HANDLER_CONSUMED;\n \t} else {\n-\t\trc = __rmnet_map_ingress_handler(skb, r);\n+\t\trc = __rmnet_map_ingress_handler(skb, port);\n \t}\n \n \treturn rc;\n }\n \n static int rmnet_map_egress_handler(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *r,\n+\t\t\t\t struct rmnet_port *port,\n \t\t\t\t struct rmnet_endpoint *ep,\n \t\t\t\t struct net_device *orig_dev)\n {\n@@ -173,7 +173,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,\n \tif (!map_header)\n \t\treturn RMNET_MAP_CONSUMED;\n \n-\tif (r->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) {\n+\tif (port->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) {\n \t\tif (ep->mux_id == 0xff)\n \t\t\tmap_header->mux_id = 0;\n \t\telse\n@@ -193,7 +193,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,\n */\n rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)\n {\n-\tstruct rmnet_real_dev_info *r;\n+\tstruct rmnet_port *port;\n \tstruct sk_buff *skb = *pskb;\n \tstruct net_device *dev;\n \tint rc;\n@@ -202,16 +202,16 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)\n \t\treturn RX_HANDLER_CONSUMED;\n \n \tdev = skb->dev;\n-\tr = rmnet_get_real_dev_info(dev);\n+\tport = rmnet_get_port(dev);\n \n-\tif (r->ingress_data_format & RMNET_INGRESS_FORMAT_MAP) {\n-\t\trc = rmnet_map_ingress_handler(skb, r);\n+\tif (port->ingress_data_format & RMNET_INGRESS_FORMAT_MAP) {\n+\t\trc = rmnet_map_ingress_handler(skb, port);\n \t} else {\n \t\tswitch (ntohs(skb->protocol)) {\n \t\tcase ETH_P_MAP:\n-\t\t\tif (r->local_ep.rmnet_mode ==\n+\t\t\tif (port->local_ep.rmnet_mode ==\n \t\t\t\tRMNET_EPMODE_BRIDGE) {\n-\t\t\t\trc = rmnet_ingress_deliver_packet(skb, r);\n+\t\t\t\trc = rmnet_ingress_deliver_packet(skb, port);\n \t\t\t} else {\n \t\t\t\tkfree_skb(skb);\n \t\t\t\trc = RX_HANDLER_CONSUMED;\n@@ -220,7 +220,7 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)\n \n \t\tcase ETH_P_IP:\n \t\tcase ETH_P_IPV6:\n-\t\t\trc = rmnet_ingress_deliver_packet(skb, r);\n+\t\t\trc = rmnet_ingress_deliver_packet(skb, port);\n \t\t\tbreak;\n \n \t\tdefault:\n@@ -238,20 +238,20 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)\n void rmnet_egress_handler(struct sk_buff *skb,\n \t\t\t struct rmnet_endpoint *ep)\n {\n-\tstruct rmnet_real_dev_info *r;\n \tstruct net_device *orig_dev;\n+\tstruct rmnet_port *port;\n \n \torig_dev = skb->dev;\n \tskb->dev = ep->egress_dev;\n \n-\tr = rmnet_get_real_dev_info(skb->dev);\n-\tif (!r) {\n+\tport = rmnet_get_port(skb->dev);\n+\tif (!port) {\n \t\tkfree_skb(skb);\n \t\treturn;\n \t}\n \n-\tif (r->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {\n-\t\tswitch (rmnet_map_egress_handler(skb, r, ep, orig_dev)) {\n+\tif (port->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {\n+\t\tswitch (rmnet_map_egress_handler(skb, port, ep, orig_dev)) {\n \t\tcase RMNET_MAP_CONSUMED:\n \t\t\treturn;\n \ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h\nindex 2aabad2..ce2302c 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h\n@@ -77,12 +77,10 @@ struct rmnet_map_header {\n #define RMNET_MAP_ADD_PAD_BYTES 1\n \n u8 rmnet_map_demultiplex(struct sk_buff *skb);\n-struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *rdinfo);\n-\n+struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb);\n struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,\n \t\t\t\t\t\t int hdrlen, int pad);\n rx_handler_result_t rmnet_map_command(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *rdinfo);\n+\t\t\t\t struct rmnet_port *port);\n \n #endif /* _RMNET_MAP_H_ */\ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c\nindex ccded40..d1ea5e2 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c\n@@ -17,7 +17,7 @@\n #include \"rmnet_vnd.h\"\n \n static u8 rmnet_map_do_flow_control(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *rdinfo,\n+\t\t\t\t struct rmnet_port *rdinfo,\n \t\t\t\t int enable)\n {\n \tstruct rmnet_map_control_command *cmd;\n@@ -58,8 +58,7 @@ static u8 rmnet_map_do_flow_control(struct sk_buff *skb,\n }\n \n static void rmnet_map_send_ack(struct sk_buff *skb,\n-\t\t\t unsigned char type,\n-\t\t\t struct rmnet_real_dev_info *rdinfo)\n+\t\t\t unsigned char type)\n {\n \tstruct rmnet_map_control_command *cmd;\n \tint xmit_status;\n@@ -78,7 +77,7 @@ static void rmnet_map_send_ack(struct sk_buff *skb,\n * name is decoded here and appropriate handler is called.\n */\n rx_handler_result_t rmnet_map_command(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *rdinfo)\n+\t\t\t\t struct rmnet_port *port)\n {\n \tstruct rmnet_map_control_command *cmd;\n \tunsigned char command_name;\n@@ -89,11 +88,11 @@ rx_handler_result_t rmnet_map_command(struct sk_buff *skb,\n \n \tswitch (command_name) {\n \tcase RMNET_MAP_COMMAND_FLOW_ENABLE:\n-\t\trc = rmnet_map_do_flow_control(skb, rdinfo, 1);\n+\t\trc = rmnet_map_do_flow_control(skb, port, 1);\n \t\tbreak;\n \n \tcase RMNET_MAP_COMMAND_FLOW_DISABLE:\n-\t\trc = rmnet_map_do_flow_control(skb, rdinfo, 0);\n+\t\trc = rmnet_map_do_flow_control(skb, port, 0);\n \t\tbreak;\n \n \tdefault:\n@@ -102,6 +101,6 @@ rx_handler_result_t rmnet_map_command(struct sk_buff *skb,\n \t\tbreak;\n \t}\n \tif (rc == RMNET_MAP_COMMAND_ACK)\n-\t\trmnet_map_send_ack(skb, rc, rdinfo);\n+\t\trmnet_map_send_ack(skb, rc);\n \treturn RX_HANDLER_CONSUMED;\n }\ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c\nindex a29c476..557c9bf 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c\n@@ -69,8 +69,7 @@ struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,\n * returned, indicating that there are no more packets to deaggregate. Caller\n * is responsible for freeing the original skb.\n */\n-struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,\n-\t\t\t\t struct rmnet_real_dev_info *rdinfo)\n+struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb)\n {\n \tstruct rmnet_map_header *maph;\n \tstruct sk_buff *skbn;\ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c\nindex f5c63b7..7f90d55 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c\n@@ -99,19 +99,20 @@ void rmnet_vnd_setup(struct net_device *rmnet_dev)\n /* Exposed API */\n \n int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,\n-\t\t struct rmnet_real_dev_info *r,\n+\t\t struct rmnet_port *port,\n \t\t struct net_device *real_dev)\n {\n \tstruct rmnet_priv *priv;\n \tint rc;\n \n-\tif (r->rmnet_devices[id])\n+\tif (port->rmnet_devices[id])\n \t\treturn -EINVAL;\n \n \trc = register_netdevice(rmnet_dev);\n \tif (!rc) {\n-\t\tr->rmnet_devices[id] = rmnet_dev;\n-\t\tr->nr_rmnet_devs++;\n+\t\tport->rmnet_devices[id] = rmnet_dev;\n+\t\tport->nr_rmnet_devs++;\n+\n \t\trmnet_dev->rtnl_link_ops = &rmnet_link_ops;\n \n \t\tpriv = netdev_priv(rmnet_dev);\n@@ -124,13 +125,13 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,\n \treturn rc;\n }\n \n-int rmnet_vnd_dellink(u8 id, struct rmnet_real_dev_info *r)\n+int rmnet_vnd_dellink(u8 id, struct rmnet_port *port)\n {\n-\tif (id >= RMNET_MAX_LOGICAL_EP || !r->rmnet_devices[id])\n+\tif (id >= RMNET_MAX_LOGICAL_EP || !port->rmnet_devices[id])\n \t\treturn -EINVAL;\n \n-\tr->rmnet_devices[id] = NULL;\n-\tr->nr_rmnet_devs--;\n+\tport->rmnet_devices[id] = NULL;\n+\tport->nr_rmnet_devs--;\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h\nindex 9084e44..8a4042f 100644\n--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h\n+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h\n@@ -19,9 +19,9 @@\n int rmnet_vnd_do_flow_control(struct net_device *dev, int enable);\n struct rmnet_endpoint *rmnet_vnd_get_endpoint(struct net_device *dev);\n int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev,\n-\t\t struct rmnet_real_dev_info *r,\n+\t\t struct rmnet_port *port,\n \t\t struct net_device *real_dev);\n-int rmnet_vnd_dellink(u8 id, struct rmnet_real_dev_info *r);\n+int rmnet_vnd_dellink(u8 id, struct rmnet_port *port);\n void rmnet_vnd_rx_fixup(struct sk_buff *skb, struct net_device *dev);\n void rmnet_vnd_tx_fixup(struct sk_buff *skb, struct net_device *dev);\n u8 rmnet_vnd_get_mux(struct net_device *rmnet_dev);\n", "prefixes": [ "net-next", "6/6" ] }