diff options
| -rw-r--r-- | drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h | 3 | ||||
| -rw-r--r-- | drivers/rmnet/shs/rmnet_shs_wq.c | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h b/drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h index e69b07e..22ad45a 100644 --- a/drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h +++ b/drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h @@ -1881,10 +1881,7 @@ struct DWC_ETH_QOS_prv_data { struct class* avb_class_b_class; struct delayed_work ipv6_addr_assign_wq; bool print_kpi; -<<<<<<< HEAD unsigned long default_ptp_clock; -======= ->>>>>>> LA.UM.9.1.R1.10.00.00.604.030 bool wol_enabled; }; diff --git a/drivers/rmnet/shs/rmnet_shs_wq.c b/drivers/rmnet/shs/rmnet_shs_wq.c index 4f9e4c5..07566a2 100644 --- a/drivers/rmnet/shs/rmnet_shs_wq.c +++ b/drivers/rmnet/shs/rmnet_shs_wq.c @@ -2027,16 +2027,7 @@ void rmnet_shs_wq_update_stats(void) } rmnet_shs_wq_refresh_new_flow_list(); -<<<<<<< HEAD -<<<<<<< HEAD -======= - /*Invoke after both the locks are released*/ - rmnet_shs_wq_cleanup_hash_tbl(PERIODIC_CLEAN); - rmnet_shs_wq_debug_print_flows(); -======= ->>>>>>> LA.UM.9.1.R1.10.00.00.604.035 rmnet_shs_wq_filter(); ->>>>>>> LA.UM.9.1.R1.10.00.00.604.030 } void rmnet_shs_wq_process_wq(struct work_struct *work) @@ -2056,11 +2047,8 @@ void rmnet_shs_wq_process_wq(struct work_struct *work) rmnet_shs_wq_cleanup_hash_tbl(PERIODIC_CLEAN); rmnet_shs_wq_debug_print_flows(); -<<<<<<< HEAD -======= jiffies = msecs_to_jiffies(rmnet_shs_wq_interval_ms); ->>>>>>> LA.UM.9.1.R1.10.00.00.604.035 queue_delayed_work(rmnet_shs_wq, &rmnet_shs_delayed_wq->wq, jiffies); |