GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb/net: rndis: merge duplicate 802_* OIDs

Browse source 
The 802_* network OIDs were duplicated, so let's merge them and
use the RNDIS_* prefixed definitions from the hyperV driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Linus Walleij 2012-05-11 22:16:16 +00:00 • committed by David S. Miller
parent 8cdddc3f9d
commit 4cc6c4d584
3 changed files with 187 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

76
include/linux/rndis.h
View file

@ -70,21 +70,6 @@
/* IEEE 802.3 (Ethernet) OIDs */
#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001
#define OID_802_3_CURRENT_ADDRESS 0x01010102
#define OID_802_3_MULTICAST_LIST 0x01010103
#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
#define OID_802_3_MAC_OPTIONS 0x01010105
#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101
#define OID_802_3_XMIT_ONE_COLLISION 0x01020102
#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103
#define OID_802_3_XMIT_DEFERRED 0x01020201
#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202
#define OID_802_3_RCV_OVERRUN 0x01020203
#define OID_802_3_XMIT_UNDERRUN 0x01020204
#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205
#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
/* RNDIS_OID_GEN_MINIPORT_INFO constants */
#define NDIS_MINIPORT_BUS_MASTER 0x00000001
#define NDIS_MINIPORT_WDM_DRIVER 0x00000002
@ -402,6 +387,33 @@
#define RNDIS_OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
#define RNDIS_OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
#define RNDIS_OID_802_11_BSSID 0x0d010101
#define RNDIS_OID_802_11_SSID 0x0d010102
#define RNDIS_OID_802_11_INFRASTRUCTURE_MODE 0x0d010108
#define RNDIS_OID_802_11_ADD_WEP 0x0d010113
#define RNDIS_OID_802_11_REMOVE_WEP 0x0d010114
#define RNDIS_OID_802_11_DISASSOCIATE 0x0d010115
#define RNDIS_OID_802_11_AUTHENTICATION_MODE 0x0d010118
#define RNDIS_OID_802_11_PRIVACY_FILTER 0x0d010119
#define RNDIS_OID_802_11_BSSID_LIST_SCAN 0x0d01011a
#define RNDIS_OID_802_11_ENCRYPTION_STATUS 0x0d01011b
#define RNDIS_OID_802_11_ADD_KEY 0x0d01011d
#define RNDIS_OID_802_11_REMOVE_KEY 0x0d01011e
#define RNDIS_OID_802_11_ASSOCIATION_INFORMATION 0x0d01011f
#define RNDIS_OID_802_11_CAPABILITY 0x0d010122
#define RNDIS_OID_802_11_PMKID 0x0d010123
#define RNDIS_OID_802_11_NETWORK_TYPES_SUPPORTED 0x0d010203
#define RNDIS_OID_802_11_NETWORK_TYPE_IN_USE 0x0d010204
#define RNDIS_OID_802_11_TX_POWER_LEVEL 0x0d010205
#define RNDIS_OID_802_11_RSSI 0x0d010206
#define RNDIS_OID_802_11_RSSI_TRIGGER 0x0d010207
#define RNDIS_OID_802_11_FRAGMENTATION_THRESHOLD 0x0d010209
#define RNDIS_OID_802_11_RTS_THRESHOLD 0x0d01020a
#define RNDIS_OID_802_11_SUPPORTED_RATES 0x0d01020e
#define RNDIS_OID_802_11_CONFIGURATION 0x0d010211
#define RNDIS_OID_802_11_POWER_MODE 0x0d010216
#define RNDIS_OID_802_11_BSSID_LIST 0x0d010217
#define REMOTE_CONDIS_MP_CREATE_VC_MSG 0x00008001
#define REMOTE_CONDIS_MP_DELETE_VC_MSG 0x00008002
#define REMOTE_CONDIS_MP_ACTIVATE_VC_MSG 0x00008005
@ -438,37 +450,3 @@
/* Remote NDIS medium connection states. */
#define RNDIS_MEDIA_STATE_CONNECTED 0x00000000
#define RNDIS_MEDIA_STATE_DISCONNECTED 0x00000001
/* From drivers/net/wireless/rndis_wlan.c */
/* various RNDIS OID defs */
#define OID_802_3_CURRENT_ADDRESS 0x01010102
#define OID_802_3_MULTICAST_LIST 0x01010103
#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
#define OID_802_11_BSSID 0x0d010101
#define OID_802_11_SSID 0x0d010102
#define OID_802_11_INFRASTRUCTURE_MODE 0x0d010108
#define OID_802_11_ADD_WEP 0x0d010113
#define OID_802_11_REMOVE_WEP 0x0d010114
#define OID_802_11_DISASSOCIATE 0x0d010115
#define OID_802_11_AUTHENTICATION_MODE 0x0d010118
#define OID_802_11_PRIVACY_FILTER 0x0d010119
#define OID_802_11_BSSID_LIST_SCAN 0x0d01011a
#define OID_802_11_ENCRYPTION_STATUS 0x0d01011b
#define OID_802_11_ADD_KEY 0x0d01011d
#define OID_802_11_REMOVE_KEY 0x0d01011e
#define OID_802_11_ASSOCIATION_INFORMATION 0x0d01011f
#define OID_802_11_CAPABILITY 0x0d010122
#define OID_802_11_PMKID 0x0d010123
#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0d010203
#define OID_802_11_NETWORK_TYPE_IN_USE 0x0d010204
#define OID_802_11_TX_POWER_LEVEL 0x0d010205
#define OID_802_11_RSSI 0x0d010206
#define OID_802_11_RSSI_TRIGGER 0x0d010207
#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0d010209
#define OID_802_11_RTS_THRESHOLD 0x0d01020a
#define OID_802_11_SUPPORTED_RATES 0x0d01020e
#define OID_802_11_CONFIGURATION 0x0d010211
#define OID_802_11_POWER_MODE 0x0d010216
#define OID_802_11_BSSID_LIST 0x0d010217