Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7564e615 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 220041f1 on remote branch 

Change-Id: I34d1e358c0c74de5c71d4a8e50d2d856bd61b724
parents 683ead1f 220041f1

core/cds/inc/cds_regdomain.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011, 2014-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2011, 2014-2019 The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -65,7 +65,7 @@ 
#define MAX_CHANNELS_PER_OPERATING_CLASS  25

#define CDS_MAX_SUPP_OPER_CLASSES 32

#define MIN_TX_PWR_CAP    8

#define MAX_TX_PWR_CAP    22

#define MAX_TX_PWR_CAP    30



#define CTRY_DEFAULT          0

#define CTRY_FLAG             0x8000

core/cds/inc/cds_sched.h

+4 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "cds_config.h"

#include "cds_reg_service.h"

#include "qdf_cpuhp.h"

#include "ol_txrx.h"



#define TX_POST_EVENT               0x001

#define TX_SUSPEND_EVENT            0x002
@@ -90,7 +91,8 @@ typedef void (*cds_ol_rx_thread_cb)(void *context, void *rxpkt, uint16_t staid); 
typedef void (*cds_ol_mon_thread_cb)(

			void *context, void *monpkt,

			uint8_t vdev_id, uint8_t tid,

			uint8_t status, bool pkt_format);

			struct ol_mon_tx_status pkt_tx_status,

			bool pkt_format);



typedef int (*send_mode_change_event_cb)(void);
@@ -140,7 +142,7 @@ struct cds_ol_mon_pkt { 
	uint8_t tid;



	/* Tx packet status */

	uint8_t status;

	struct ol_mon_tx_status pkt_tx_status;



	/* 0 = 802.3 format , 1 = 802.11 format */

	bool pkt_format;

core/cds/src/cds_api.c

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ void *cds_get_context(QDF_MODULE_ID moduleId) 
	}



	if (pModContext == NULL) {

		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,

		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG,

			  "%s: Module ID %i context is Null", __func__,

			  moduleId);

	}

core/cds/src/cds_sched.c

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ static void cds_mon_from_queue(p_cds_sched_context pschedcontext) 
		vdev_id = pkt->vdev_id;

		tid = pkt->tid;

		pkt->callback(pkt->context, pkt->monpkt, vdev_id,

			      tid, pkt->status, pkt->pkt_format);

			      tid, pkt->pkt_tx_status, pkt->pkt_format);

		cds_free_ol_mon_pkt(pschedcontext, pkt);

		spin_lock_bh(&pschedcontext->ol_mon_queue_lock);

	}

core/dp/ol/inc/ol_txrx_osif_api.h

+4 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, 
 * @mon_buf_list: netbuf list

 * @type: data process type

 * @tid:  tid number

 * @status: Tx status

 * @pkt_tx_status: Tx status

 * @pktformat: Frame format

 *

 * Return: none
@@ -91,7 +91,9 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, 
void ol_txrx_mon_data_process(uint8_t vdev_id,

			      qdf_nbuf_t mon_buf_list,

			      enum mon_data_process_type type,

			      uint8_t tid, uint8_t status, bool pktformat);

			      uint8_t tid,

			      struct ol_mon_tx_status pkt_tx_status,

			      bool pktformat);



void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer,

			     bool drop);