mirror of
https://github.com/abperiasamy/rtl8812AU_8821AU_linux.git
synced 2025-10-19 17:11:09 +02:00
merge new version v4.3.14 from https://github.com/ptpt52/rtl8812au (#160)
This commit is contained in:
committed by
Harshavardhana
parent
c962f7a88d
commit
00aedbde5c
@@ -1,7 +1,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of version 2 of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
@@ -84,11 +84,11 @@
|
||||
|
||||
|
||||
#ifndef OID_802_11_CAPABILITY
|
||||
#define OID_802_11_CAPABILITY 0x0d010122
|
||||
#define OID_802_11_CAPABILITY 0x0d010122
|
||||
#endif
|
||||
|
||||
#ifndef OID_802_11_PMKID
|
||||
#define OID_802_11_PMKID 0x0d010123
|
||||
#define OID_802_11_PMKID 0x0d010123
|
||||
#endif
|
||||
|
||||
|
||||
@@ -126,11 +126,10 @@
|
||||
if((!dbg)) \
|
||||
{ \
|
||||
RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __FUNCTION__, __LINE__, str)); \
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
enum oid_type
|
||||
{
|
||||
enum oid_type {
|
||||
QUERY_OID,
|
||||
SET_OID
|
||||
};
|
||||
@@ -138,14 +137,13 @@ enum oid_type
|
||||
struct oid_funs_node {
|
||||
unsigned int oid_start; //the starting number for OID
|
||||
unsigned int oid_end; //the ending number for OID
|
||||
struct oid_obj_priv *node_array;
|
||||
struct oid_obj_priv *node_array;
|
||||
unsigned int array_sz; //the size of node_array
|
||||
int query_counter; //count the number of query hits for this segment
|
||||
int set_counter; //count the number of set hits for this segment
|
||||
int query_counter; //count the number of query hits for this segment
|
||||
int set_counter; //count the number of set hits for this segment
|
||||
};
|
||||
|
||||
struct oid_par_priv
|
||||
{
|
||||
struct oid_par_priv {
|
||||
void *adapter_context;
|
||||
NDIS_OID oid;
|
||||
void *information_buf;
|
||||
@@ -157,8 +155,8 @@ struct oid_par_priv
|
||||
};
|
||||
|
||||
struct oid_obj_priv {
|
||||
unsigned char dbg; // 0: without OID debug message 1: with OID debug message
|
||||
NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv);
|
||||
unsigned char dbg; // 0: without OID debug message 1: with OID debug message
|
||||
NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv);
|
||||
};
|
||||
|
||||
#if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_)) || \
|
||||
@@ -294,7 +292,7 @@ NDIS_STATUS oid_802_11_bssid_list_hdl(struct oid_par_priv* poid_par_priv);
|
||||
NDIS_STATUS oid_802_11_statistics_hdl(struct oid_par_priv* poid_par_priv);
|
||||
|
||||
|
||||
//OID Handler for Segment ED
|
||||
//OID Handler for Segment ED
|
||||
NDIS_STATUS oid_rt_mh_vender_id_hdl(struct oid_par_priv* poid_par_priv);
|
||||
|
||||
void Set_802_3_MULTICAST_LIST(ADAPTER *pAdapter, UCHAR *MCListbuf, ULONG MCListlen, BOOLEAN bAcceptAllMulticast);
|
||||
@@ -308,22 +306,22 @@ extern struct iw_handler_def rtw_handlers_def;
|
||||
extern void rtw_request_wps_pbc_event(_adapter *padapter);
|
||||
|
||||
extern NDIS_STATUS drv_query_info(
|
||||
IN _nic_hdl MiniportAdapterContext,
|
||||
IN NDIS_OID Oid,
|
||||
IN void * InformationBuffer,
|
||||
IN u32 InformationBufferLength,
|
||||
OUT u32* BytesWritten,
|
||||
OUT u32* BytesNeeded
|
||||
);
|
||||
IN _nic_hdl MiniportAdapterContext,
|
||||
IN NDIS_OID Oid,
|
||||
IN void * InformationBuffer,
|
||||
IN u32 InformationBufferLength,
|
||||
OUT u32* BytesWritten,
|
||||
OUT u32* BytesNeeded
|
||||
);
|
||||
|
||||
extern NDIS_STATUS drv_set_info(
|
||||
IN _nic_hdl MiniportAdapterContext,
|
||||
IN NDIS_OID Oid,
|
||||
IN void * InformationBuffer,
|
||||
IN u32 InformationBufferLength,
|
||||
OUT u32* BytesRead,
|
||||
OUT u32* BytesNeeded
|
||||
);
|
||||
IN _nic_hdl MiniportAdapterContext,
|
||||
IN NDIS_OID Oid,
|
||||
IN void * InformationBuffer,
|
||||
IN u32 InformationBufferLength,
|
||||
OUT u32* BytesRead,
|
||||
OUT u32* BytesNeeded
|
||||
);
|
||||
|
||||
#endif // #ifndef __INC_CEINFO_
|
||||
|
||||
|
Reference in New Issue
Block a user