samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Update timespec API usage

Browse Source 
Kernel code should now use the timespec64 struct instead of the older
struct timespec and its APIs.

Change-Id: I2792b637bf1054521e3f1ff7c82d1cdbf4f3adea
Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>
This commit is contained in:
Sean Tranchetti
2020-04-02 15:20:45 -06:00
parent d6d43874af
commit 5fd6051c6c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/rmnet_genl.c
View File

@@ -168,7 +168,7 @@ void rmnet_boost_for_pid(pid_t pid, int boost_enable,
static void rmnet_create_pid_bps_resp(struct rmnet_core_pid_bps_resp static void rmnet_create_pid_bps_resp(struct rmnet_core_pid_bps_resp
*pid_bps_resp_ptr) *pid_bps_resp_ptr)
{ {
struct timespec time; struct timespec64 time;
struct hlist_node *tmp; struct hlist_node *tmp;
struct rmnet_pid_node_s *node_p; struct rmnet_pid_node_s *node_p;
unsigned long ht_flags; unsigned long ht_flags;
@@ -176,7 +176,7 @@ static void rmnet_create_pid_bps_resp(struct rmnet_core_pid_bps_resp
int i; int i;
u16 bkt; u16 bkt;
(void)getnstimeofday(&time); ktime_get_real_ts64(&time);
pid_bps_resp_ptr->timestamp = RMNET_GENL_SEC_TO_NSEC(time.tv_sec) + pid_bps_resp_ptr->timestamp = RMNET_GENL_SEC_TO_NSEC(time.tv_sec) +
time.tv_nsec; time.tv_nsec;

10
core/rmnet_map_data.c
View File

@@ -1247,7 +1247,7 @@ static void rmnet_map_flush_tx_packet_work(struct work_struct *work)
skb = port->agg_skb; skb = port->agg_skb;
port->agg_skb = NULL; port->agg_skb = NULL;
port->agg_count = 0; port->agg_count = 0;
memset(&port->agg_time, 0, sizeof(struct timespec)); memset(&port->agg_time, 0, sizeof(port->agg_time));
} }
port->agg_state = 0; port->agg_state = 0;
} }
@@ -1437,7 +1437,7 @@ void rmnet_map_tx_aggregate(struct sk_buff *skb, struct rmnet_port *port)
new_packet: new_packet:
spin_lock_irqsave(&port->agg_lock, flags); spin_lock_irqsave(&port->agg_lock, flags);
memcpy(&last, &port->agg_last, sizeof(struct timespec)); memcpy(&last, &port->agg_last, sizeof(last));
ktime_get_real_ts64(&port->agg_last); ktime_get_real_ts64(&port->agg_last);
if ((port->data_format & RMNET_EGRESS_FORMAT_PRIORITY) && if ((port->data_format & RMNET_EGRESS_FORMAT_PRIORITY) &&
@@ -1469,7 +1469,7 @@ new_packet:
if (!port->agg_skb) { if (!port->agg_skb) {
port->agg_skb = 0; port->agg_skb = 0;
port->agg_count = 0; port->agg_count = 0;
memset(&port->agg_time, 0, sizeof(struct timespec)); memset(&port->agg_time, 0, sizeof(port->agg_time));
spin_unlock_irqrestore(&port->agg_lock, flags); spin_unlock_irqrestore(&port->agg_lock, flags);
skb->protocol = htons(ETH_P_MAP); skb->protocol = htons(ETH_P_MAP);
dev_queue_xmit(skb); dev_queue_xmit(skb);
@@ -1570,7 +1570,7 @@ void rmnet_map_tx_aggregate_exit(struct rmnet_port *port)
kfree_skb(port->agg_skb); kfree_skb(port->agg_skb);
port->agg_skb = NULL; port->agg_skb = NULL;
port->agg_count = 0; port->agg_count = 0;
memset(&port->agg_time, 0, sizeof(struct timespec)); memset(&port->agg_time, 0, sizeof(port->agg_time));
} }
port->agg_state = 0; port->agg_state = 0;
@@ -1594,7 +1594,7 @@ void rmnet_map_tx_qmap_cmd(struct sk_buff *qmap_skb)
agg_skb = port->agg_skb; agg_skb = port->agg_skb;
port->agg_skb = 0; port->agg_skb = 0;
port->agg_count = 0; port->agg_count = 0;
memset(&port->agg_time, 0, sizeof(struct timespec)); memset(&port->agg_time, 0, sizeof(port->agg_time));
port->agg_state = 0; port->agg_state = 0;
spin_unlock_irqrestore(&port->agg_lock, flags); spin_unlock_irqrestore(&port->agg_lock, flags);
hrtimer_cancel(&port->hrtimer); hrtimer_cancel(&port->hrtimer);