core: rmnet: Fastforward to 4.19 tip

This brings the RmNet and DFC modules up to date with the 4.19 tip as of
commit 9b38611ea527 ("rmnet: Reduce synchronize_rcu calls").

As part of this, the rmnet_ctl driver was also incorporated, using commit
4ceee3aafb7d ("rmnet_ctl: Add IPC logging and optimizations")

Change-Id: Ic45d46074c7401dfed408c769cfb6462dac0d4ee
Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>

core/qmi_rmnet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,8 +21,8 @@
 #define CONFIG_QTI_QMI_POWER_COLLAPSE 1
 
 struct qmi_rmnet_ps_ind {
-	void (*ps_on_handler)(void *);
-	void (*ps_off_handler)(void *);
+	void (*ps_on_handler)(void *port);
+	void (*ps_off_handler)(void *port);
 	struct list_head list;
 };
 
@@ -56,7 +56,8 @@ qmi_rmnet_all_flows_enabled(struct net_device *dev)
 
 #ifdef CONFIG_QTI_QMI_DFC
 void *qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id);
-void qmi_rmnet_qos_exit(struct net_device *dev, void *qos);
+void qmi_rmnet_qos_exit_pre(void *qos);
+void qmi_rmnet_qos_exit_post(void);
 void qmi_rmnet_burst_fc_check(struct net_device *dev,
 			      int ip_type, u32 mark, unsigned int len);
 int qmi_rmnet_get_queue(struct net_device *dev, struct sk_buff *skb);
@@ -67,7 +68,11 @@ qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id)
 	return NULL;
 }
 
-static inline void qmi_rmnet_qos_exit(struct net_device *dev, void *qos)
+static inline void qmi_rmnet_qos_exit_pre(void *qos)
+{
+}
+
+static inline void qmi_rmnet_qos_exit_post(void)
 {
 }
 
@@ -122,23 +127,23 @@ static inline bool qmi_rmnet_ignore_grant(void *port)
 	return false;
 }
 
-static inline int qmi_rmnet_ps_ind_register(void *port,
+static inline int qmi_rmnet_ps_ind_register(struct rmnet_port *port,
 				     struct qmi_rmnet_ps_ind *ps_ind)
 {
 	return 0;
 }
-static inline int qmi_rmnet_ps_ind_deregister(void *port,
+static inline int qmi_rmnet_ps_ind_deregister(struct rmnet_port *port,
 				       struct qmi_rmnet_ps_ind *ps_ind)
 {
 	return 0;
 }
 
-static inline void qmi_rmnet_ps_off_notify(void *port)
+static inline void qmi_rmnet_ps_off_notify(struct rmnet_port *port)
 {
 
 }
 
-static inline void qmi_rmnet_ps_on_notify(void *port)
+static inline void qmi_rmnet_ps_on_notify(struct rmnet_port *port)
 {
 
 }