staging: rtl8723bs: Remove unused macros in wifi.h

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove unused macros.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/26af5a910e84523d9040ee29967c9b3a4971daa5.1719155208.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Philipp Hortmann and committed by

Greg Kroah-Hartman 2 years ago 30b09d4b 859c3ebe

-299

1 changed file

expand all

drivers

staging

rtl8723bs

include

wifi.h

-299

drivers/staging/rtl8723bs/include/wifi.h

··· 7 7 #ifndef _WIFI_H_ 8 8 #define _WIFI_H_ 9 9 10 - #define WLAN_ETHHDR_LEN 14 11 - #define WLAN_ETHADDR_LEN 6 12 - #define WLAN_IEEE_OUI_LEN 3 13 - #define WLAN_ADDR_LEN 6 14 - #define WLAN_CRC_LEN 4 15 - #define WLAN_BSSID_LEN 6 16 - #define WLAN_BSS_TS_LEN 8 17 10 #define WLAN_HDR_A3_LEN 24 18 - #define WLAN_HDR_A4_LEN 30 19 11 #define WLAN_HDR_A3_QOS_LEN 26 20 - #define WLAN_HDR_A4_QOS_LEN 32 21 - #define WLAN_SSID_MAXLEN 32 22 - #define WLAN_DATA_MAXLEN 2312 23 12 24 - #define WLAN_A3_PN_OFFSET 24 25 - #define WLAN_A4_PN_OFFSET 30 26 - 27 - #define WLAN_MIN_ETHFRM_LEN 60 28 - #define WLAN_MAX_ETHFRM_LEN 1514 29 - #define WLAN_ETHHDR_LEN 14 30 13 #define WLAN_WMM_LEN 24 31 - 32 - #define P80211CAPTURE_VERSION 0x80211001 33 14 34 15 /* This value is tested by WiFi 11n Test Plan 5.2.3. */ 35 16 /* This test verifies the WLAN NIC can update the NAV through sending the CTS with large duration. */ ··· 144 163 145 164 #define GetFragNum(pbuf) \ 146 165 (le16_to_cpu(*(__le16 *)((size_t)(pbuf) + 22)) & 0x0f) 147 - 148 - #define GetTupleCache(pbuf) \ 149 - (cpu_to_le16(*(unsigned short *)((size_t)(pbuf) + 22))) 150 166 151 167 #define SetFragNum(pbuf, num) \ 152 168 do { \ ··· 283 305 /*----------------------------------------------------------------------------- 284 306 Below is for the security related definition 285 307 ------------------------------------------------------------------------------*/ 286 - #define _RESERVED_FRAME_TYPE_ 0 287 - #define _SKB_FRAME_TYPE_ 2 288 - #define _PRE_ALLOCMEM_ 1 289 - #define _PRE_ALLOCHDR_ 3 290 - #define _PRE_ALLOCLLCHDR_ 4 291 - #define _PRE_ALLOCICVHDR_ 5 292 - #define _PRE_ALLOCMICHDR_ 6 293 - 294 - #define _ACKCTSLNG_ 14 /* 14 bytes long, including crclng */ 295 - #define _CRCLNG_ 4 296 308 297 309 #define _ASOCREQ_IE_OFFSET_ 4 /* excluding wlan_hdr */ 298 - #define _ASOCRSP_IE_OFFSET_ 6 299 310 #define _REASOCREQ_IE_OFFSET_ 10 300 - #define _REASOCRSP_IE_OFFSET_ 6 301 311 #define _PROBEREQ_IE_OFFSET_ 0 302 312 #define _PROBERSP_IE_OFFSET_ 12 303 313 #define _AUTH_IE_OFFSET_ 6 304 - #define _DEAUTH_IE_OFFSET_ 0 305 314 #define _BEACON_IE_OFFSET_ 12 306 - #define _PUBLIC_ACTION_IE_OFFSET_ 8 307 315 308 316 #define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ 309 317 ··· 300 336 #define _AUTH_SEQ_NUM_ 2 301 337 #define _BEACON_ITERVAL_ 2 302 338 #define _CAPABILITY_ 2 303 - #define _CURRENT_APADDR_ 6 304 - #define _LISTEN_INTERVAL_ 2 305 339 #define _RSON_CODE_ 2 306 340 #define _ASOC_ID_ 2 307 341 #define _STATUS_CODE_ 2 308 342 #define _TIMESTAMP_ 8 309 - 310 - #define AUTH_ODD_TO 0 311 - #define AUTH_EVEN_TO 1 312 - 313 - #define WLAN_ETHCONV_ENCAP 1 314 - #define WLAN_ETHCONV_RFC1042 2 315 - #define WLAN_ETHCONV_8021h 3 316 343 317 344 /*----------------------------------------------------------------------------- 318 345 Below is the definition for 802.11i / 802.1x ··· 316 361 Below is the definition for WMM 317 362 ------------------------------------------------------------------------------*/ 318 363 #define _WMM_IE_Length_ 7 /* for WMM STA */ 319 - #define _WMM_Para_Element_Length_ 24 320 - 321 364 322 365 /*----------------------------------------------------------------------------- 323 366 Below is the definition for 802.11n 324 367 ------------------------------------------------------------------------------*/ 325 - 326 - #define SetOrderBit(pbuf) \ 327 - do { \ 328 - *(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \ 329 - } while (0) 330 - 331 368 #define GetOrderBit(pbuf) (((*(unsigned short *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0) 332 369 333 370 #define ACT_CAT_VENDOR 0x7F/* 127 */ ··· 387 440 #define IEEE80211_HT_CAP_SGI_40 0x0040 388 441 #define IEEE80211_HT_CAP_TX_STBC 0x0080 389 442 #define IEEE80211_HT_CAP_RX_STBC_1R 0x0100 390 - #define IEEE80211_HT_CAP_RX_STBC_2R 0x0200 391 443 #define IEEE80211_HT_CAP_RX_STBC_3R 0x0300 392 - #define IEEE80211_HT_CAP_DELAY_BA 0x0400 393 444 #define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 394 445 #define IEEE80211_HT_CAP_DSSSCCK40 0x1000 395 446 /* 802.11n HT capability AMPDU settings */ 396 447 #define IEEE80211_HT_CAP_AMPDU_FACTOR 0x03 397 448 #define IEEE80211_HT_CAP_AMPDU_DENSITY 0x1C 398 - /* 802.11n HT capability MSC set */ 399 - #define IEEE80211_SUPP_MCS_SET_UEQM 4 400 - #define IEEE80211_HT_CAP_MAX_STREAMS 4 401 - #define IEEE80211_SUPP_MCS_SET_LEN 10 402 - /* maximum streams the spec allows */ 403 - #define IEEE80211_HT_CAP_MCS_TX_DEFINED 0x01 404 - #define IEEE80211_HT_CAP_MCS_TX_RX_DIFF 0x02 405 - #define IEEE80211_HT_CAP_MCS_TX_STREAMS 0x0C 406 - #define IEEE80211_HT_CAP_MCS_TX_UEQM 0x10 407 - /* 802.11n HT capability TXBF capability */ 408 - #define IEEE80211_HT_CAP_TXBF_RX_NDP 0x00000008 409 - #define IEEE80211_HT_CAP_TXBF_TX_NDP 0x00000010 410 - #define IEEE80211_HT_CAP_TXBF_EXPLICIT_COMP_STEERING_CAP 0x00000400 411 449 412 450 /* endif */ 413 451 414 452 /* ===============WPS Section =============== */ 415 - /* For WPSv1.0 */ 416 - #define WPSOUI 0x0050f204 417 453 /* WPS attribute ID */ 418 - #define WPS_ATTR_VER1 0x104A 419 - #define WPS_ATTR_SIMPLE_CONF_STATE 0x1044 420 - #define WPS_ATTR_RESP_TYPE 0x103B 421 - #define WPS_ATTR_UUID_E 0x1047 422 - #define WPS_ATTR_MANUFACTURER 0x1021 423 - #define WPS_ATTR_MODEL_NAME 0x1023 424 - #define WPS_ATTR_MODEL_NUMBER 0x1024 425 - #define WPS_ATTR_SERIAL_NUMBER 0x1042 426 - #define WPS_ATTR_PRIMARY_DEV_TYPE 0x1054 427 - #define WPS_ATTR_SEC_DEV_TYPE_LIST 0x1055 428 - #define WPS_ATTR_DEVICE_NAME 0x1011 429 - #define WPS_ATTR_CONF_METHOD 0x1008 430 - #define WPS_ATTR_RF_BANDS 0x103C 431 - #define WPS_ATTR_DEVICE_PWID 0x1012 432 - #define WPS_ATTR_REQUEST_TYPE 0x103A 433 - #define WPS_ATTR_ASSOCIATION_STATE 0x1002 434 - #define WPS_ATTR_CONFIG_ERROR 0x1009 435 - #define WPS_ATTR_VENDOR_EXT 0x1049 436 454 #define WPS_ATTR_SELECTED_REGISTRAR 0x1041 437 455 438 - /* Value of WPS attribute "WPS_ATTR_DEVICE_NAME */ 439 - #define WPS_MAX_DEVICE_NAME_LEN 32 440 - 441 - /* Value of WPS Request Type Attribute */ 442 - #define WPS_REQ_TYPE_ENROLLEE_INFO_ONLY 0x00 443 - #define WPS_REQ_TYPE_ENROLLEE_OPEN_8021X 0x01 444 - #define WPS_REQ_TYPE_REGISTRAR 0x02 445 - #define WPS_REQ_TYPE_WLAN_MANAGER_REGISTRAR 0x03 446 - 447 - /* Value of WPS Response Type Attribute */ 448 - #define WPS_RESPONSE_TYPE_INFO_ONLY 0x00 449 - #define WPS_RESPONSE_TYPE_8021X 0x01 450 - #define WPS_RESPONSE_TYPE_REGISTRAR 0x02 451 - #define WPS_RESPONSE_TYPE_AP 0x03 452 - 453 - /* Value of WPS WiFi Simple Configuration State Attribute */ 454 - #define WPS_WSC_STATE_NOT_CONFIG 0x01 455 - #define WPS_WSC_STATE_CONFIG 0x02 456 - 457 - /* Value of WPS Version Attribute */ 458 - #define WPS_VERSION_1 0x10 459 - 460 - /* Value of WPS Configuration Method Attribute */ 461 - #define WPS_CONFIG_METHOD_FLASH 0x0001 462 - #define WPS_CONFIG_METHOD_ETHERNET 0x0002 463 - #define WPS_CONFIG_METHOD_LABEL 0x0004 464 - #define WPS_CONFIG_METHOD_DISPLAY 0x0008 465 - #define WPS_CONFIG_METHOD_E_NFC 0x0010 466 - #define WPS_CONFIG_METHOD_I_NFC 0x0020 467 - #define WPS_CONFIG_METHOD_NFC 0x0040 468 - #define WPS_CONFIG_METHOD_PBC 0x0080 469 - #define WPS_CONFIG_METHOD_KEYPAD 0x0100 470 - #define WPS_CONFIG_METHOD_VPBC 0x0280 471 - #define WPS_CONFIG_METHOD_PPBC 0x0480 472 - #define WPS_CONFIG_METHOD_VDISPLAY 0x2008 473 - #define WPS_CONFIG_METHOD_PDISPLAY 0x4008 474 - 475 - /* Value of Category ID of WPS Primary Device Type Attribute */ 476 - #define WPS_PDT_CID_DISPLAYS 0x0007 477 - #define WPS_PDT_CID_MULIT_MEDIA 0x0008 478 - #define WPS_PDT_CID_RTK_WIDI WPS_PDT_CID_MULIT_MEDIA 479 - 480 - /* Value of Sub Category ID of WPS Primary Device Type Attribute */ 481 - #define WPS_PDT_SCID_MEDIA_SERVER 0x0005 482 - #define WPS_PDT_SCID_RTK_DMP WPS_PDT_SCID_MEDIA_SERVER 483 - 484 - /* Value of Device Password ID */ 485 - #define WPS_DPID_PIN 0x0000 486 - #define WPS_DPID_USER_SPEC 0x0001 487 - #define WPS_DPID_MACHINE_SPEC 0x0002 488 - #define WPS_DPID_REKEY 0x0003 489 - #define WPS_DPID_PBC 0x0004 490 - #define WPS_DPID_REGISTRAR_SPEC 0x0005 491 - 492 - /* Value of WPS RF Bands Attribute */ 493 - #define WPS_RF_BANDS_2_4_GHZ 0x01 494 - #define WPS_RF_BANDS_5_GHZ 0x02 495 - 496 - /* Value of WPS Association State Attribute */ 497 - #define WPS_ASSOC_STATE_NOT_ASSOCIATED 0x00 498 - #define WPS_ASSOC_STATE_CONNECTION_SUCCESS 0x01 499 - #define WPS_ASSOC_STATE_CONFIGURATION_FAILURE 0x02 500 - #define WPS_ASSOC_STATE_ASSOCIATION_FAILURE 0x03 501 - #define WPS_ASSOC_STATE_IP_FAILURE 0x04 502 - 503 456 /* =====================P2P Section ===================== */ 504 - /* For P2P */ 505 - #define P2POUI 0x506F9A09 506 - 507 - /* P2P Attribute ID */ 508 - #define P2P_ATTR_STATUS 0x00 509 - #define P2P_ATTR_MINOR_REASON_CODE 0x01 510 - #define P2P_ATTR_CAPABILITY 0x02 511 - #define P2P_ATTR_DEVICE_ID 0x03 512 - #define P2P_ATTR_GO_INTENT 0x04 513 - #define P2P_ATTR_CONF_TIMEOUT 0x05 514 - #define P2P_ATTR_LISTEN_CH 0x06 515 - #define P2P_ATTR_GROUP_BSSID 0x07 516 - #define P2P_ATTR_EX_LISTEN_TIMING 0x08 517 - #define P2P_ATTR_INTENTED_IF_ADDR 0x09 518 - #define P2P_ATTR_MANAGEABILITY 0x0A 519 - #define P2P_ATTR_CH_LIST 0x0B 520 - #define P2P_ATTR_NOA 0x0C 521 - #define P2P_ATTR_DEVICE_INFO 0x0D 522 - #define P2P_ATTR_GROUP_INFO 0x0E 523 - #define P2P_ATTR_GROUP_ID 0x0F 524 - #define P2P_ATTR_INTERFACE 0x10 525 - #define P2P_ATTR_OPERATING_CH 0x11 526 - #define P2P_ATTR_INVITATION_FLAGS 0x12 527 - 528 - /* Value of Status Attribute */ 529 - #define P2P_STATUS_SUCCESS 0x00 530 - #define P2P_STATUS_FAIL_INFO_UNAVAILABLE 0x01 531 - #define P2P_STATUS_FAIL_INCOMPATIBLE_PARAM 0x02 532 - #define P2P_STATUS_FAIL_LIMIT_REACHED 0x03 533 - #define P2P_STATUS_FAIL_INVALID_PARAM 0x04 534 - #define P2P_STATUS_FAIL_REQUEST_UNABLE 0x05 535 - #define P2P_STATUS_FAIL_PREVOUS_PROTO_ERR 0x06 536 - #define P2P_STATUS_FAIL_NO_COMMON_CH 0x07 537 - #define P2P_STATUS_FAIL_UNKNOWN_P2PGROUP 0x08 538 - #define P2P_STATUS_FAIL_BOTH_GOINTENT_15 0x09 539 - #define P2P_STATUS_FAIL_INCOMPATIBLE_PROVSION 0x0A 540 - #define P2P_STATUS_FAIL_USER_REJECT 0x0B 541 - 542 - /* Value of Invitation Flags Attribute */ 543 - #define P2P_INVITATION_FLAGS_PERSISTENT BIT(0) 544 - 545 - #define DMP_P2P_DEVCAP_SUPPORT (P2P_DEVCAP_SERVICE_DISCOVERY | \ 546 - P2P_DEVCAP_CLIENT_DISCOVERABILITY | \ 547 - P2P_DEVCAP_CONCURRENT_OPERATION | \ 548 - P2P_DEVCAP_INVITATION_PROC) 549 - 550 - #define DMP_P2P_GRPCAP_SUPPORT (P2P_GRPCAP_INTRABSS) 551 - 552 - /* Value of Device Capability Bitmap */ 553 - #define P2P_DEVCAP_SERVICE_DISCOVERY BIT(0) 554 - #define P2P_DEVCAP_CLIENT_DISCOVERABILITY BIT(1) 555 - #define P2P_DEVCAP_CONCURRENT_OPERATION BIT(2) 556 - #define P2P_DEVCAP_INFRA_MANAGED BIT(3) 557 - #define P2P_DEVCAP_DEVICE_LIMIT BIT(4) 558 - #define P2P_DEVCAP_INVITATION_PROC BIT(5) 559 - 560 - /* Value of Group Capability Bitmap */ 561 - #define P2P_GRPCAP_GO BIT(0) 562 - #define P2P_GRPCAP_PERSISTENT_GROUP BIT(1) 563 - #define P2P_GRPCAP_GROUP_LIMIT BIT(2) 564 - #define P2P_GRPCAP_INTRABSS BIT(3) 565 - #define P2P_GRPCAP_CROSS_CONN BIT(4) 566 - #define P2P_GRPCAP_PERSISTENT_RECONN BIT(5) 567 - #define P2P_GRPCAP_GROUP_FORMATION BIT(6) 568 - 569 - /* P2P Public Action Frame (Management Frame) */ 570 - #define P2P_PUB_ACTION_ACTION 0x09 571 - 572 - /* P2P Public Action Frame Type */ 573 - #define P2P_GO_NEGO_REQ 0 574 - #define P2P_GO_NEGO_RESP 1 575 - #define P2P_GO_NEGO_CONF 2 576 - #define P2P_INVIT_REQ 3 577 - #define P2P_INVIT_RESP 4 578 - #define P2P_DEVDISC_REQ 5 579 - #define P2P_DEVDISC_RESP 6 580 - #define P2P_PROVISION_DISC_REQ 7 581 - #define P2P_PROVISION_DISC_RESP 8 582 - 583 - /* P2P Action Frame Type */ 584 - #define P2P_NOTICE_OF_ABSENCE 0 585 - #define P2P_PRESENCE_REQUEST 1 586 - #define P2P_PRESENCE_RESPONSE 2 587 - #define P2P_GO_DISC_REQUEST 3 588 - 589 - 590 - #define P2P_MAX_PERSISTENT_GROUP_NUM 10 591 - 592 - #define P2P_PROVISIONING_SCAN_CNT 3 593 - 594 - #define P2P_WILDCARD_SSID_LEN 7 595 - 596 - #define P2P_FINDPHASE_EX_NONE 0 /* default value, used when: (1)p2p disabled or (2)p2p enabled but only do 1 scan phase */ 597 - #define P2P_FINDPHASE_EX_FULL 1 /* used when p2p enabled and want to do 1 scan phase and P2P_FINDPHASE_EX_MAX-1 find phase */ 598 - #define P2P_FINDPHASE_EX_SOCIAL_FIRST (P2P_FINDPHASE_EX_FULL+1) 599 - #define P2P_FINDPHASE_EX_MAX 4 600 - #define P2P_FINDPHASE_EX_SOCIAL_LAST P2P_FINDPHASE_EX_MAX 601 - 602 - #define P2P_PROVISION_TIMEOUT 5000 /* 5 seconds timeout for sending the provision discovery request */ 603 - #define P2P_CONCURRENT_PROVISION_TIMEOUT 3000 /* 3 seconds timeout for sending the provision discovery request under concurrent mode */ 604 - #define P2P_GO_NEGO_TIMEOUT 5000 /* 5 seconds timeout for receiving the group negotiation response */ 605 - #define P2P_CONCURRENT_GO_NEGO_TIMEOUT 3000 /* 3 seconds timeout for sending the negotiation request under concurrent mode */ 606 - #define P2P_TX_PRESCAN_TIMEOUT 100 /* 100ms */ 607 - #define P2P_INVITE_TIMEOUT 5000 /* 5 seconds timeout for sending the invitation request */ 608 - #define P2P_CONCURRENT_INVITE_TIMEOUT 3000 /* 3 seconds timeout for sending the invitation request under concurrent mode */ 609 - #define P2P_RESET_SCAN_CH 25000 /* 25 seconds timeout to reset the scan channel (based on channel plan) */ 610 - #define P2P_MAX_INTENT 15 611 - 612 - #define P2P_MAX_NOA_NUM 2 613 - 614 - /* WPS Configuration Method */ 615 - #define WPS_CM_NONE 0x0000 616 - #define WPS_CM_LABEL 0x0004 617 - #define WPS_CM_DISPLYA 0x0008 618 - #define WPS_CM_EXTERNAL_NFC_TOKEN 0x0010 619 - #define WPS_CM_INTEGRATED_NFC_TOKEN 0x0020 620 - #define WPS_CM_NFC_INTERFACE 0x0040 621 - #define WPS_CM_PUSH_BUTTON 0x0080 622 - #define WPS_CM_KEYPAD 0x0100 623 - #define WPS_CM_SW_PUHS_BUTTON 0x0280 624 - #define WPS_CM_HW_PUHS_BUTTON 0x0480 625 - #define WPS_CM_SW_DISPLAY_PIN 0x2008 626 - #define WPS_CM_LCD_DISPLAY_PIN 0x4008 627 - 628 457 enum p2p_role { 629 458 P2P_ROLE_DISABLE = 0, 630 459 P2P_ROLE_DEVICE = 1, ··· 440 717 P2P_GOT_WPSINFO_SELF_DISPLAY_PIN = 2, 441 718 P2P_GOT_WPSINFO_PBC = 3, 442 719 }; 443 - 444 - #define P2P_PRIVATE_IOCTL_SET_LEN 64 445 - 446 - /* =====================WFD Section ===================== */ 447 - /* For Wi-Fi Display */ 448 - #define WFD_ATTR_DEVICE_INFO 0x00 449 - #define WFD_ATTR_ASSOC_BSSID 0x01 450 - #define WFD_ATTR_COUPLED_SINK_INFO 0x06 451 - #define WFD_ATTR_LOCAL_IP_ADDR 0x08 452 - #define WFD_ATTR_SESSION_INFO 0x09 453 - #define WFD_ATTR_ALTER_MAC 0x0a 454 - 455 - /* For WFD Device Information Attribute */ 456 - #define WFD_DEVINFO_SOURCE 0x0000 457 - #define WFD_DEVINFO_PSINK 0x0001 458 - #define WFD_DEVINFO_SSINK 0x0002 459 - #define WFD_DEVINFO_DUAL 0x0003 460 - 461 - #define WFD_DEVINFO_SESSION_AVAIL 0x0010 462 - #define WFD_DEVINFO_WSD 0x0040 463 - #define WFD_DEVINFO_PC_TDLS 0x0080 464 - #define WFD_DEVINFO_HDCP_SUPPORT 0x0100 465 720 466 721 #define IP_MCAST_MAC(mac) ((mac[0] == 0x01) && (mac[1] == 0x00) && (mac[2] == 0x5e)) 467 722 #define ICMPV6_MCAST_MAC(mac) ((mac[0] == 0x33) && (mac[1] == 0x33) && (mac[2] != 0xff))