Changeset 3992
- Timestamp:
- 01/31/08 10:22:11 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
r3930 r3992 1 Index: linux-2.6.24 -rc8/drivers/sdio/function/Kconfig1 Index: linux-2.6.24/drivers/sdio/function/Kconfig 2 2 =================================================================== 3 3 --- /dev/null 4 +++ linux-2.6.24 -rc8/drivers/sdio/function/Kconfig4 +++ linux-2.6.24/drivers/sdio/function/Kconfig 5 5 @@ -0,0 +1,11 @@ 6 6 +#menu "SDIO function drivers" … … 16 16 +#endmenu 17 17 \ No newline at end of file 18 Index: linux-2.6.24 -rc8/drivers/sdio/function/Makefile18 Index: linux-2.6.24/drivers/sdio/function/Makefile 19 19 =================================================================== 20 20 --- /dev/null 21 +++ linux-2.6.24 -rc8/drivers/sdio/function/Makefile21 +++ linux-2.6.24/drivers/sdio/function/Makefile 22 22 @@ -0,0 +1 @@ 23 23 +obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan/ 24 24 \ No newline at end of file 25 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/Makefile25 Index: linux-2.6.24/drivers/sdio/function/wlan/Makefile 26 26 =================================================================== 27 27 --- /dev/null 28 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/Makefile28 +++ linux-2.6.24/drivers/sdio/function/wlan/Makefile 29 29 @@ -0,0 +1,4 @@ 30 30 +# … … 33 33 +obj-$(CONFIG_SDIO_AR6000_WLAN) += ar6000/ 34 34 \ No newline at end of file 35 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/Makefile35 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/Makefile 36 36 =================================================================== 37 37 --- /dev/null 38 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/Makefile38 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/Makefile 39 39 @@ -0,0 +1,38 @@ 40 40 +REV ?= 2 … … 76 76 + 77 77 + 78 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c78 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 79 79 =================================================================== 80 80 --- /dev/null 81 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c81 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 82 82 @@ -0,0 +1,3070 @@ 83 83 +/* … … 3151 3151 +{ 3152 3152 +} 3153 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h3153 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 3154 3154 =================================================================== 3155 3155 --- /dev/null 3156 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h3156 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 3157 3157 @@ -0,0 +1,361 @@ 3158 3158 +/* … … 3517 3517 + 3518 3518 +#endif /* _AR6000_H_ */ 3519 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c3519 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 3520 3520 =================================================================== 3521 3521 --- /dev/null 3522 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c3522 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 3523 3523 @@ -0,0 +1,439 @@ 3524 3524 +/* … … 3961 3961 +} 3962 3962 +#endif /* HTC_RAW_INTERFACE */ 3963 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h3963 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 3964 3964 =================================================================== 3965 3965 --- /dev/null 3966 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h3966 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 3967 3967 @@ -0,0 +1,128 @@ 3968 3968 +#ifndef _AR6XAPI_LINUX_H … … 4094 4094 + 4095 4095 +#endif 4096 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h4096 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 4097 4097 =================================================================== 4098 4098 --- /dev/null 4099 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h4099 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 4100 4100 @@ -0,0 +1,993 @@ 4101 4101 +/* … … 4142 4142 +#define IEEE80211_IOCTL_DELKEY (SIOCIWFIRSTPRIV+4) 4143 4143 +#define IEEE80211_IOCTL_GETWMMPARAMS (SIOCIWFIRSTPRIV+5) 4144 +#define IEEE80211_IOCTL_SETMLME (SIOCIWFIRSTPRIV+6)4145 4144 +#define IEEE80211_IOCTL_SETOPTIE (SIOCIWFIRSTPRIV+6) 4146 +#define IEEE80211_IOCTL_GETOPTIE (SIOCIWFIRSTPRIV+7) 4145 +#define IEEE80211_IOCTL_SETMLME (SIOCIWFIRSTPRIV+7) 4146 +//#define IEEE80211_IOCTL_GETOPTIE (SIOCIWFIRSTPRIV+7) 4147 4147 +#define IEEE80211_IOCTL_ADDPMKID (SIOCIWFIRSTPRIV+8) 4148 4148 +//#define IEEE80211_IOCTL_SETAUTHALG (SIOCIWFIRSTPRIV+10) … … 5092 5092 +#endif 5093 5093 +#endif 5094 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h5094 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 5095 5095 =================================================================== 5096 5096 --- /dev/null 5097 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h5097 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 5098 5098 @@ -0,0 +1,47 @@ 5099 5099 +/* … … 5144 5144 + 5145 5145 +#endif /* _ATHTYPES_LINUX_H_ */ 5146 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h5146 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 5147 5147 =================================================================== 5148 5148 --- /dev/null 5149 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h5149 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 5150 5150 @@ -0,0 +1,44 @@ 5151 5151 +/* … … 5193 5193 + 5194 5194 +#endif 5195 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h5195 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 5196 5196 =================================================================== 5197 5197 --- /dev/null 5198 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h5198 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 5199 5199 @@ -0,0 +1,86 @@ 5200 5200 +/* … … 5284 5284 + 5285 5285 +#endif /* _DEBUG_LINUX_H_ */ 5286 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c5286 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 5287 5287 =================================================================== 5288 5288 --- /dev/null 5289 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c5289 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 5290 5290 @@ -0,0 +1,2573 @@ 5291 5291 +/* … … 7862 7862 +} 7863 7863 + 7864 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c7864 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 7865 7865 =================================================================== 7866 7866 --- /dev/null 7867 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c7867 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 7868 7868 @@ -0,0 +1,225 @@ 7869 7869 + … … 8092 8092 +} 8093 8093 + 8094 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h8094 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 8095 8095 =================================================================== 8096 8096 --- /dev/null 8097 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h8097 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 8098 8098 @@ -0,0 +1,319 @@ 8099 8099 +/* … … 8416 8416 + 8417 8417 +#endif /* _OSAPI_LINUX_H_ */ 8418 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c8418 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 8419 8419 =================================================================== 8420 8420 --- /dev/null 8421 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c8422 @@ -0,0 +1, 1866@@8421 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 8422 @@ -0,0 +1,2068 @@ 8423 8423 +/* 8424 8424 + * … … 8454 8454 + 8455 8455 + 8456 +#if WIRELESS_EXT > 148457 8456 +/* 8458 8457 + * Encode a WPA or RSN information element as a custom … … 8477 8476 + return (i == ielen ? p - (u_int8_t *)buf : 0); 8478 8477 +} 8479 +#endif /* WIRELESS_EXT > 14 */8480 8478 + 8481 8479 +void … … 8497 8495 + } 8498 8496 + if ((param->firstPass == TRUE) && 8499 + ((ni->ni_cie.ie_wpa == NULL) ||(ni->ni_cie.ie_rsn == NULL))) {8497 + ((ni->ni_cie.ie_wpa == NULL) && (ni->ni_cie.ie_rsn == NULL))) { 8500 8498 + /* 8501 8499 + * Only forward wpa bss's in first pass … … 8924 8922 + struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra; 8925 8923 + 8926 + if ((ar->arWmiReady == FALSE) || (ar->arConnected != TRUE)) { 8927 + return -EIO; 8928 + } 8924 + if ((ar->arWmiReady == FALSE) || (ar->arConnected != TRUE)) 8925 + return -EIO; 8929 8926 + 8930 8927 + switch (mlme->im_op) { … … 8954 8951 +} 8955 8952 + 8956 +int 8957 + ar6000_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info,8958 + void *w, char *extra)8959 + {8960 + return 0;8953 +int ar6000_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info, 8954 + struct iw_point *data, char *extra) 8955 +{ 8956 + /* The target generates the WPA/RSN IE */ 8957 + return 0; 8961 8958 +} 8962 8959 + … … 9384 9381 +} 9385 9382 + 9383 +#if 0 9384 +static int ar6000_ioctl_siwgenie(struct net_device *dev, 9385 + struct iw_request_info *info, 9386 + struct iw_point *dwrq, 9387 + char *extra) 9388 +{ 9389 + return 0; 9390 +} 9391 + 9392 +static int ar6000_ioctl_giwgenie(struct net_device *dev, 9393 + struct iw_request_info *info, 9394 + struct iw_point *dwrq, 9395 + char *extra) 9396 +{ 9397 + return 0; 9398 +} 9399 + 9400 +static int ar6000_ioctl_siwauth(struct net_device *dev, 9401 + struct iw_request_info *info, 9402 + struct iw_param *param, 9403 + char *extra) 9404 +{ 9405 + AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev); 9406 + int reset = 0; 9407 + 9408 + switch (param->flags & IW_AUTH_INDEX) { 9409 + case IW_AUTH_WPA_VERSION: 9410 + if (param->value & IW_AUTH_WPA_VERSION_DISABLED) { 9411 + ar->arAuthMode = NONE_AUTH; 9412 + } 9413 + if (param->value & IW_AUTH_WPA_VERSION_WPA) { 9414 + ar->arAuthMode = WPA_AUTH; 9415 + } 9416 + if (param->value & IW_AUTH_WPA_VERSION_WPA2) { 9417 + ar->arAuthMode = WPA2_AUTH; 9418 + } 9419 + 9420 + reset = 1; 9421 + break; 9422 + case IW_AUTH_CIPHER_PAIRWISE: 9423 + if (param->value & IW_AUTH_CIPHER_NONE) { 9424 + ar->arPairwiseCrypto = NONE_CRYPT; 9425 + } 9426 + if (param->value & IW_AUTH_CIPHER_WEP40) { 9427 + ar->arPairwiseCrypto = WEP_CRYPT; 9428 + } 9429 + if (param->value & IW_AUTH_CIPHER_TKIP) { 9430 + ar->arPairwiseCrypto = TKIP_CRYPT; 9431 + } 9432 + if (param->value & IW_AUTH_CIPHER_CCMP) { 9433 + ar->arPairwiseCrypto = AES_CRYPT; 9434 + } 9435 + 9436 + reset = 1; 9437 + break; 9438 + case IW_AUTH_CIPHER_GROUP: 9439 + if (param->value & IW_AUTH_CIPHER_NONE) { 9440 + ar->arGroupCrypto = NONE_CRYPT; 9441 + } 9442 + if (param->value & IW_AUTH_CIPHER_WEP40) { 9443 + ar->arGroupCrypto = WEP_CRYPT; 9444 + } 9445 + if (param->value & IW_AUTH_CIPHER_TKIP) { 9446 + ar->arGroupCrypto = TKIP_CRYPT; 9447 + } 9448 + if (param->value & IW_AUTH_CIPHER_CCMP) { 9449 + ar->arGroupCrypto = AES_CRYPT; 9450 + } 9451 + 9452 + reset = 1; 9453 + break; 9454 + case IW_AUTH_KEY_MGMT: 9455 + if (param->value & IW_AUTH_KEY_MGMT_PSK) { 9456 + if (ar->arAuthMode == WPA_AUTH) { 9457 + ar->arAuthMode = WPA_PSK_AUTH; 9458 + } else if (ar->arAuthMode == WPA2_AUTH) { 9459 + ar->arAuthMode = WPA2_PSK_AUTH; 9460 + } 9461 + 9462 + reset = 1; 9463 + } 9464 + break; 9465 + 9466 + case IW_AUTH_TKIP_COUNTERMEASURES: 9467 + if (ar->arWmiReady == FALSE) { 9468 + return -EIO; 9469 + } 9470 + wmi_set_tkip_countermeasures_cmd(ar->arWmi, param->value); 9471 + break; 9472 + 9473 + case IW_AUTH_DROP_UNENCRYPTED: 9474 + break; 9475 + 9476 + case IW_AUTH_80211_AUTH_ALG: 9477 + if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) { 9478 + ar->arDot11AuthMode = OPEN_AUTH; 9479 + } 9480 + if (param->value & IW_AUTH_ALG_SHARED_KEY) { 9481 + ar->arDot11AuthMode = SHARED_AUTH; 9482 + } 9483 + if (param->value & IW_AUTH_ALG_LEAP) { 9484 + ar->arDot11AuthMode = LEAP_AUTH; 9485 + ar->arPairwiseCrypto = WEP_CRYPT; 9486 + ar->arGroupCrypto = WEP_CRYPT; 9487 + } 9488 + 9489 + reset = 1; 9490 + break; 9491 + 9492 + case IW_AUTH_WPA_ENABLED: 9493 + reset = 1; 9494 + break; 9495 + 9496 + case IW_AUTH_RX_UNENCRYPTED_EAPOL: 9497 + break; 9498 + 9499 + case IW_AUTH_PRIVACY_INVOKED: 9500 + break; 9501 + 9502 + default: 9503 + return -EOPNOTSUPP; 9504 + } 9505 + 9506 + if (reset) 9507 + memset(ar->arSsid, 0, sizeof(ar->arSsid)); 9508 + 9509 + return 0; 9510 +} 9511 + 9512 +static int ar6000_ioctl_giwauth(struct net_device *dev, 9513 + struct iw_request_info *info, 9514 + struct iw_param *dwrq, 9515 + char *extra) 9516 +{ 9517 + return 0; 9518 +} 9519 + 9520 +static int ar6000_ioctl_siwencodeext(struct net_device *dev, 9521 + struct iw_request_info *info, 9522 + struct iw_point *dwrq, 9523 + char *extra) 9524 +{ 9525 + AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev); 9526 + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; 9527 + int alg = ext->alg; 9528 + 9529 + if (ar->arWlanState == WLAN_DISABLED) { 9530 + return -EIO; 9531 + } 9532 + 9533 + if ((alg == IW_ENCODE_ALG_NONE) || (dwrq->flags & IW_ENCODE_DISABLED)) { 9534 + 9535 + } else if (alg == IW_ENCODE_ALG_WEP) { 9536 + 9537 + } else if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) { 9538 + KEY_USAGE keyUsage; 9539 + A_STATUS status; 9540 + CRYPTO_TYPE keyType = NONE_CRYPT; 9541 + 9542 + 9543 + if (((alg == IW_ENCODE_ALG_TKIP) && (ext->key_len != KEY_LEN_WPA_TKIP)) 9544 + || ((alg == IW_ENCODE_ALG_CCMP) && (ext->key_len != KEY_LEN_WPA_AES))) { 9545 + printk("Wrong length %d\n", ext->key_len); 9546 + return -EINVAL; 9547 + } 9548 + 9549 + if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { 9550 + 9551 + } else { 9552 + } 9553 + 9554 + 9555 + } else { 9556 + printk("Wrong alg %d\n", alg); 9557 + } 9558 + 9559 + return 0; 9560 +} 9561 + 9562 + 9563 +static int ar6000_ioctl_giwencodeext(struct net_device *dev, 9564 + struct iw_request_info *info, 9565 + struct iw_point *dwrq, 9566 + char *extra) 9567 +{ 9568 + return 0; 9569 +} 9570 +#endif 9571 + 9386 9572 +static int 9387 9573 +ar6000_ioctl_setparam(struct net_device *dev, … … 9415 9601 + profChanged = TRUE; 9416 9602 + break; 9603 + default: 9604 + printk("IEEE80211_PARAM_WPA: Unknown value %d\n", value); 9417 9605 + } 9418 9606 + break; … … 9527 9715 +int 9528 9716 +ar6000_ioctl_setkey(struct net_device *dev, struct iw_request_info *info, 9529 + void *w, char *extra)9717 + void *w, char *extra) 9530 9718 +{ 9531 9719 + AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv; … … 9934 10122 + 9935 10123 +/* 9936 + * SIOC GIWSCAN10124 + * SIOCSIWSCAN 9937 10125 + */ 9938 10126 +int … … 9955 10143 + } 9956 10144 + 9957 +#if 19958 10145 + /* We ask for everything from the target */ 9959 10146 + if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) { … … 9961 10148 + ret = -EIO; 9962 10149 + } 9963 +#endif9964 10150 + 9965 10151 + if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \ … … 10073 10259 + (iw_handler) NULL, /* SIOCSIWPOWER */ 10074 10260 + (iw_handler) NULL, /* SIOCGIWPOWER */ 10261 + (iw_handler) NULL, /* -- hole -- */ 10262 + (iw_handler) NULL, /* -- hole -- */ 10263 +#if 0 10264 + (iw_handler) ar6000_ioctl_siwgenie, /* SIOCSIWGENIE */ 10265 + (iw_handler) ar6000_ioctl_giwgenie, /* SIOCGIWGENIE */ 10266 + (iw_handler) ar6000_ioctl_siwauth, /* SIOCSIWAUTH */ 10267 + (iw_handler) ar6000_ioctl_giwauth, /* SIOCGIWAUTH */ 10268 + (iw_handler) ar6000_ioctl_siwencodeext,/* SIOCSIWENCODEEXT */ 10269 + (iw_handler) ar6000_ioctl_giwencodeext,/* SIOCGIWENCODEEXT */ 10270 + (iw_handler) NULL, /* SIOCSIWPMKSA */ 10271 +#endif 10272 + 10075 10273 +#endif /* NOTYET */ 10076 10274 +}; … … 10083 10281 + (iw_handler) ar6000_ioctl_delkey, /* SIOCWFIRSTPRIV+4 */ 10084 10282 + (iw_handler) ar6000_ioctl_getwmmparams, /* SIOCWFIRSTPRIV+5 */ 10085 + (iw_handler) NULL,/* SIOCWFIRSTPRIV+6 */10086 + (iw_handler) NULL,/* SIOCWFIRSTPRIV+7 */10283 + (iw_handler) ar6000_ioctl_setoptie, /* SIOCWFIRSTPRIV+6 */ 10284 + (iw_handler) ar6000_ioctl_setmlme, /* SIOCWFIRSTPRIV+7 */ 10087 10285 + (iw_handler) ar6000_ioctl_addpmkid, /* SIOCWFIRSTPRIV+8 */ 10088 10286 + (iw_handler) NULL, /* SIOCWFIRSTPRIV+9 */ … … 10202 10400 + IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 10203 10401 + IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwmmparams"}, 10402 + { IEEE80211_IOCTL_SETOPTIE, 10403 + IW_PRIV_TYPE_BYTE, 0, "setie"}, 10404 + { IEEE80211_IOCTL_SETMLME, 10405 + IW_PRIV_TYPE_MLME, 0, "setmlme"}, 10204 10406 + { IEEE80211_IOCTL_ADDPMKID, 10205 10407 + IW_PRIV_TYPE_ADDPMKID | IW_PRIV_SIZE_FIXED, 0, "addpmkid"}, … … 10287 10489 + 10288 10490 + 10289 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi.c10491 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 10290 10492 =================================================================== 10291 10493 --- /dev/null 10292 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi.c10494 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 10293 10495 @@ -0,0 +1,657 @@ 10294 10496 +/* … … 10949 11151 + return status; 10950 11152 +} 10951 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h11153 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 10952 11154 =================================================================== 10953 11155 --- /dev/null 10954 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h11156 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 10955 11157 @@ -0,0 +1,45 @@ 10956 11158 +#ifndef BMI_INTERNAL_H … … 10999 11201 + 11000 11202 +#endif 11001 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/hif/hif.c11203 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/hif/hif.c 11002 11204 =================================================================== 11003 11205 --- /dev/null 11004 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/hif/hif.c11206 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/hif/hif.c 11005 11207 @@ -0,0 +1,818 @@ 11006 11208 +/* … … 11822 12024 + return; 11823 12025 +} 11824 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h12026 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 11825 12027 =================================================================== 11826 12028 --- /dev/null 11827 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h12029 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 11828 12030 @@ -0,0 +1,102 @@ 11829 12031 +/* … … 11929 12131 +void 11930 12132 +delHifDevice(SDDEVICE *handle); 11931 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.c12133 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 11932 12134 =================================================================== 11933 12135 --- /dev/null 11934 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.c12136 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 11935 12137 @@ -0,0 +1,991 @@ 11936 12138 +/* … … 12925 13127 + 12926 13128 + 12927 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.h13129 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 12928 13130 =================================================================== 12929 13131 --- /dev/null 12930 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.h13132 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 12931 13133 @@ -0,0 +1,191 @@ 12932 13134 +/* … … 13121 13323 + 13122 13324 +#endif /*AR6K_H_*/ 13123 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c13325 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 13124 13326 =================================================================== 13125 13327 --- /dev/null 13126 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c13328 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 13127 13329 @@ -0,0 +1,638 @@ 13128 13330 +/* … … 13764 13966 + 13765 13967 + 13766 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc.c13968 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc.c 13767 13969 =================================================================== 13768 13970 --- /dev/null 13769 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc.c13971 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc.c 13770 13972 @@ -0,0 +1,507 @@ 13771 13973 +/* … … 14276 14478 +#endif 14277 14479 +} 14278 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h14480 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 14279 14481 =================================================================== 14280 14482 --- /dev/null 14281 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h14483 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 14282 14484 @@ -0,0 +1,65 @@ 14283 14485 +#ifndef HTC_DEBUG_H_ … … 14346 14548 + 14347 14549 +#endif /*HTC_DEBUG_H_*/ 14348 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h14550 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 14349 14551 =================================================================== 14350 14552 --- /dev/null 14351 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h14553 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 14352 14554 @@ -0,0 +1,168 @@ 14353 14555 +/* … … 14519 14721 + 14520 14722 +#endif /* _HTC_INTERNAL_H_ */ 14521 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c14723 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 14522 14724 =================================================================== 14523 14725 --- /dev/null 14524 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c14726 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 14525 14727 @@ -0,0 +1,703 @@ 14526 14728 +/* … … 15227 15429 + 15228 15430 + 15229 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_send.c15431 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 15230 15432 =================================================================== 15231 15433 --- /dev/null 15232 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_send.c15434 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 15233 15435 @@ -0,0 +1,541 @@ 15234 15436 +/* … … 15773 15975 + 15774 15976 +} 15775 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_services.c15977 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 15776 15978 =================================================================== 15777 15979 --- /dev/null 15778 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/htc/htc_services.c15980 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 15779 15981 @@ -0,0 +1,403 @@ 15780 15982 +/* … … 16181 16383 + 16182 16384 +} 16183 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h16385 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 16184 16386 =================================================================== 16185 16387 --- /dev/null 16186 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h16388 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 16187 16389 @@ -0,0 +1,100 @@ 16188 16390 +/* … … 16286 16488 + 16287 16489 +#endif /* __AR6000_REGDUMP_H__ */ 16288 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h16490 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 16289 16491 =================================================================== 16290 16492 --- /dev/null 16291 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h16493 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 16292 16494 @@ -0,0 +1,36 @@ 16293 16495 +#define __VER_MAJOR_ 2 … … 16327 16529 + 16328 16530 + 16329 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW16531 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 16330 16532 =================================================================== 16331 16533 --- /dev/null 16332 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW16534 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 16333 16535 @@ -0,0 +1,36 @@ 16334 16536 +#define __VER_MAJOR_ 2 … … 16368 16570 + 16369 16571 + 16370 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h16572 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 16371 16573 =================================================================== 16372 16574 --- /dev/null 16373 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h16575 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 16374 16576 @@ -0,0 +1,147 @@ 16375 16577 +/* … … 16520 16722 + 16521 16723 +#endif /* __AR6KHWREG_H__ */ 16522 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_config.h16724 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_config.h 16523 16725 =================================================================== 16524 16726 --- /dev/null 16525 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_config.h16727 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_config.h 16526 16728 @@ -0,0 +1,27 @@ 16527 16729 +#ifndef _A_CONFIG_H_ … … 16552 16754 + 16553 16755 +#endif 16554 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_debug.h16756 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_debug.h 16555 16757 =================================================================== 16556 16758 --- /dev/null 16557 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_debug.h16759 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_debug.h 16558 16760 @@ -0,0 +1,41 @@ 16559 16761 +#ifndef _A_DEBUG_H_ … … 16598 16800 + 16599 16801 +#endif 16600 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_drv.h16802 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_drv.h 16601 16803 =================================================================== 16602 16804 --- /dev/null 16603 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_drv.h16805 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_drv.h 16604 16806 @@ -0,0 +1,28 @@ 16605 16807 +#ifndef _A_DRV_H_ … … 16631 16833 + 16632 16834 +#endif /* _ADRV_H_ */ 16633 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h16835 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 16634 16836 =================================================================== 16635 16837 --- /dev/null 16636 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h16838 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 16637 16839 @@ -0,0 +1,185 @@ 16638 16840 +#ifndef _A_DRV_API_H_ … … 16821 17023 + 16822 17024 +#endif 16823 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_osapi.h17025 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 16824 17026 =================================================================== 16825 17027 --- /dev/null 16826 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_osapi.h17028 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 16827 17029 @@ -0,0 +1,28 @@ 16828 17030 +#ifndef _A_OSAPI_H_ … … 16854 17056 + 16855 17057 +#endif /* _OSAPI_H_ */ 16856 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_types.h17058 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_types.h 16857 17059 =================================================================== 16858 17060 --- /dev/null 16859 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/a_types.h17061 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/a_types.h 16860 17062 @@ -0,0 +1,28 @@ 16861 17063 +#ifndef _A_TYPES_H_ … … 16887 17089 + 16888 17090 +#endif /* _ATHTYPES_H_ */ 16889 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h17091 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 16890 17092 =================================================================== 16891 17093 --- /dev/null 16892 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h17094 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 16893 17095 @@ -0,0 +1,29 @@ 16894 17096 +#ifndef _AR6000_API_H_ … … 16921 17123 +#endif /* _AR6000_API_H */ 16922 17124 + 16923 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h17125 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 16924 17126 =================================================================== 16925 17127 --- /dev/null 16926 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h17128 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 16927 17129 @@ -0,0 +1,38 @@ 16928 17130 +/* … … 16964 17166 + 16965 17167 +#endif /*AR6000_DIAG_H_*/ 16966 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athdefs.h17168 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athdefs.h 16967 17169 =================================================================== 16968 17170 --- /dev/null 16969 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athdefs.h17171 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athdefs.h 16970 17172 @@ -0,0 +1,85 @@ 16971 17173 +#ifndef __ATHDEFS_H__ … … 17054 17256 + 17055 17257 +#endif /* __ATHDEFS_H__ */ 17056 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athdrv.h17258 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athdrv.h 17057 17259 =================================================================== 17058 17260 --- /dev/null 17059 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athdrv.h17261 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athdrv.h 17060 17262 @@ -0,0 +1,32 @@ 17061 17263 +/* … … 17091 17293 + 17092 17294 +#endif /* _ATHDRV_H_ */ 17093 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athendpack.h17295 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athendpack.h 17094 17296 =================================================================== 17095 17297 --- /dev/null 17096 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athendpack.h17298 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athendpack.h 17097 17299 @@ -0,0 +1,41 @@ 17098 17300 +/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ … … 17137 17339 +#endif /* WINCE */ 17138 17340 + 17139 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athstartpack.h17341 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 17140 17342 =================================================================== 17141 17343 --- /dev/null 17142 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/athstartpack.h17344 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 17143 17345 @@ -0,0 +1,42 @@ 17144 17346 +/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ … … 17184 17386 +#endif /* WINCE */ 17185 17387 + 17186 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/bmi.h17388 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/bmi.h 17187 17389 =================================================================== 17188 17390 --- /dev/null 17189 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/bmi.h17391 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/bmi.h 17190 17392 @@ -0,0 +1,100 @@ 17191 17393 +#ifndef _BMI_H_ … … 17289 17491 + 17290 17492 +#endif /* _BMI_H_ */ 17291 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h17493 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 17292 17494 =================================================================== 17293 17495 --- /dev/null 17294 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h17496 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 17295 17497 @@ -0,0 +1,199 @@ 17296 17498 +#ifndef __BMI_MSG_H__ … … 17493 17695 + 17494 17696 +#endif /* __BMI_MSG_H__ */ 17495 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/common_drv.h17697 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/common_drv.h 17496 17698 =================================================================== 17497 17699 --- /dev/null 17498 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/common_drv.h17700 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/common_drv.h 17499 17701 @@ -0,0 +1,61 @@ 17500 17702 +/* … … 17559 17761 + 17560 17762 +#endif /*COMMON_DRV_H_*/ 17561 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog.h17763 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog.h 17562 17764 =================================================================== 17563 17765 --- /dev/null 17564 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog.h17766 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog.h 17565 17767 @@ -0,0 +1,107 @@ 17566 17768 +/* … … 17671 17873 + 17672 17874 +#endif /* _DBGLOG_H_ */ 17673 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h17875 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 17674 17876 =================================================================== 17675 17877 --- /dev/null 17676 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h17878 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 17677 17879 @@ -0,0 +1,46 @@ 17678 17880 +#ifndef _DBGLOG_API_H_ … … 17722 17924 + 17723 17925 +#endif /* _DBGLOG_API_H_ */ 17724 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h17926 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 17725 17927 =================================================================== 17726 17928 --- /dev/null 17727 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h17929 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 17728 17930 @@ -0,0 +1,307 @@ 17729 17931 +/* … … 18034 18236 + 18035 18237 +#endif /* _DBGLOG_ID_H_ */ 18036 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dl_list.h18238 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dl_list.h 18037 18239 =================================================================== 18038 18240 --- /dev/null 18039 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dl_list.h18241 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dl_list.h 18040 18242 @@ -0,0 +1,114 @@ 18041 18243 +/* … … 18153 18355 + 18154 18356 +#endif /* __DL_LIST_H___ */ 18155 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dset_api.h18357 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dset_api.h 18156 18358 =================================================================== 18157 18359 --- /dev/null 18158 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dset_api.h18360 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dset_api.h 18159 18361 @@ -0,0 +1,63 @@ 18160 18362 +/* … … 18221 18423 + 18222 18424 +#endif /* _DSET_API_H_ */ 18223 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dset_internal.h18425 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 18224 18426 =================================================================== 18225 18427 --- /dev/null 18226 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dset_internal.h18428 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 18227 18429 @@ -0,0 +1,39 @@ 18228 18430 +/* … … 18265 18467 + 18266 18468 +#endif /* __DSET_INTERNAL_H__ */ 18267 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dsetid.h18469 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dsetid.h 18268 18470 =================================================================== 18269 18471 --- /dev/null 18270 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/dsetid.h18472 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/dsetid.h 18271 18473 @@ -0,0 +1,110 @@ 18272 18474 +/* … … 18380 18582 + 18381 18583 +#endif /* __DSETID_H__ */ 18382 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/gpio.h18584 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/gpio.h 18383 18585 =================================================================== 18384 18586 --- /dev/null 18385 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/gpio.h18587 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/gpio.h 18386 18588 @@ -0,0 +1,34 @@ 18387 18589 +/* … … 18419 18621 +#define GPIO_LAST_REGISTER_ID GPIO_ID_PIN(17) 18420 18622 +#define GPIO_ID_NONE 0xffffffff 18421 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/gpio_api.h18623 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 18422 18624 =================================================================== 18423 18625 --- /dev/null 18424 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/gpio_api.h18626 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 18425 18627 @@ -0,0 +1,57 @@ 18426 18628 +#ifndef _GPIO_API_H_ … … 18481 18683 + 18482 18684 +#endif /* _GPIO_API_H_ */ 18483 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/hif.h18685 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/hif.h 18484 18686 =================================================================== 18485 18687 --- /dev/null 18486 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/hif.h18688 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/hif.h 18487 18689 @@ -0,0 +1,291 @@ 18488 18690 +/* … … 18777 18979 + 18778 18980 +#endif /* _HIF_H_ */ 18779 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/host_version.h18981 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/host_version.h 18780 18982 =================================================================== 18781 18983 --- /dev/null 18782 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/host_version.h18984 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/host_version.h 18783 18985 @@ -0,0 +1,49 @@ 18784 18986 +#ifndef _HOST_VERSION_H_ … … 18831 19033 + 18832 19034 +#endif /* _HOST_VERSION_H_ */ 18833 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc.h19035 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc.h 18834 19036 =================================================================== 18835 19037 --- /dev/null 18836 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc.h19038 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc.h 18837 19039 @@ -0,0 +1,190 @@ 18838 19040 +/* … … 19026 19228 +#endif /* __HTC_H__ */ 19027 19229 + 19028 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_api.h19230 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_api.h 19029 19231 =================================================================== 19030 19232 --- /dev/null 19031 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_api.h19233 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_api.h 19032 19234 @@ -0,0 +1,436 @@ 19033 19235 +/* … … 19467 19669 + 19468 19670 +#endif /* _HTC_API_H_ */ 19469 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_packet.h19671 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 19470 19672 =================================================================== 19471 19673 --- /dev/null 19472 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_packet.h19674 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 19473 19675 @@ -0,0 +1,138 @@ 19474 19676 +/* … … 19610 19812 + 19611 19813 +#endif /*HTC_PACKET_H_*/ 19612 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_services.h19814 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_services.h 19613 19815 =================================================================== 19614 19816 --- /dev/null 19615 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/htc_services.h19817 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/htc_services.h 19616 19818 @@ -0,0 +1,37 @@ 19617 19819 +/* … … 19652 19854 + 19653 19855 +#endif /*HTC_SERVICES_H_*/ 19654 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211.h19856 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 19655 19857 =================================================================== 19656 19858 --- /dev/null 19657 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211.h19859 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 19658 19860 @@ -0,0 +1,342 @@ 19659 19861 +/*- … … 19999 20201 + 20000 20202 +#endif /* _NET80211_IEEE80211_H_ */ 20001 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h20203 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 20002 20204 =================================================================== 20003 20205 --- /dev/null 20004 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h20206 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 20005 20207 @@ -0,0 +1,163 @@ 20006 20208 +/* … … 20167 20369 + 20168 20370 +#endif /* _IEEE80211_IOCTL_H_ */ 20169 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h20371 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 20170 20372 =================================================================== 20171 20373 --- /dev/null 20172 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h20374 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 20173 20375 @@ -0,0 +1,77 @@ 20174 20376 +/*- … … 20249 20451 + 20250 20452 +#endif /* _IEEE80211_NODE_H_ */ 20251 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ini_dset.h20453 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 20252 20454 =================================================================== 20253 20455 --- /dev/null 20254 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/ini_dset.h20456 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 20255 20457 @@ -0,0 +1,40 @@ 20256 20458 +/* … … 20294 20496 + 20295 20497 +#endif 20296 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/regDb.h20498 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/regDb.h 20297 20499 =================================================================== 20298 20500 --- /dev/null 20299 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/regDb.h20501 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/regDb.h 20300 20502 @@ -0,0 +1,19 @@ 20301 20503 +/* … … 20318 20520 + 20319 20521 +#endif /* __REG_DB_H__ */ 20320 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/regdump.h20522 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/regdump.h 20321 20523 =================================================================== 20322 20524 --- /dev/null 20323 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/regdump.h20525 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/regdump.h 20324 20526 @@ -0,0 +1,33 @@ 20325 20527 +#ifndef __REGDUMP_H__ … … 20356 20558 +#endif /* __ASSEMBLER__ */ 20357 20559 +#endif /* __REGDUMP_H__ */ 20358 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/targaddrs.h20560 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 20359 20561 =================================================================== 20360 20562 --- /dev/null 20361 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/targaddrs.h20563 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 20362 20564 @@ -0,0 +1,158 @@ 20363 20565 +/* … … 20519 20721 + 20520 20722 +#endif /* __TARGADDRS_H__ */ 20521 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/testcmd.h20723 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/testcmd.h 20522 20724 =================================================================== 20523 20725 --- /dev/null 20524 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/testcmd.h20726 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/testcmd.h 20525 20727 @@ -0,0 +1,144 @@ 20526 20728 +/* … … 20668 20870 + 20669 20871 +#endif /* TESTCMD_H_ */ 20670 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wlan_api.h20872 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 20671 20873 =================================================================== 20672 20874 --- /dev/null 20673 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wlan_api.h20875 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 20674 20876 @@ -0,0 +1,101 @@ 20675 20877 +#ifndef _HOST_WLAN_API_H_ … … 20774 20976 + 20775 20977 +#endif /* _HOST_WLAN_API_H_ */ 20776 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h20978 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 20777 20979 =================================================================== 20778 20980 --- /dev/null 20779 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h20981 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 20780 20982 @@ -0,0 +1,20 @@ 20781 20983 +/* … … 20799 21001 + 20800 21002 +#endif 20801 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmi.h21003 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmi.h 20802 21004 =================================================================== 20803 21005 --- /dev/null 20804 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmi.h21006 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmi.h 20805 21007 @@ -0,0 +1,1739 @@ 20806 21008 +/* … … 22543 22745 + 22544 22746 +#endif /* _WMI_H_ */ 22545 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmi_api.h22747 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 22546 22748 =================================================================== 22547 22749 --- /dev/null 22548 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmi_api.h22750 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 22549 22751 @@ -0,0 +1,259 @@ 22550 22752 +#ifndef _WMI_API_H_ … … 22807 23009 + 22808 23010 +#endif /* _WMI_API_H_ */ 22809 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmix.h23011 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmix.h 22810 23012 =================================================================== 22811 23013 --- /dev/null 22812 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/include/wmix.h23014 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmix.h 22813 23015 @@ -0,0 +1,233 @@ 22814 23016 +/* … … 23045 23247 + 23046 23248 +#endif /* _WMIX_H_ */ 23047 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c23249 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 23048 23250 =================================================================== 23049 23251 --- /dev/null 23050 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c23252 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 23051 23253 @@ -0,0 +1,467 @@ 23052 23254 + … … 23517 23719 +} 23518 23720 + 23519 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c23721 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 23520 23722 =================================================================== 23521 23723 --- /dev/null 23522 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c23724 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 23523 23725 @@ -0,0 +1,346 @@ 23524 23726 + … … 23868 24070 +} 23869 24071 + 23870 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c24072 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 23871 24073 =================================================================== 23872 24074 --- /dev/null 23873 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c24075 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 23874 24076 @@ -0,0 +1,371 @@ 23875 24077 +/*- … … 24244 24446 + IEEE80211_NODE_UNLOCK (nt); 24245 24447 +} 24246 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c24448 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 24247 24449 =================================================================== 24248 24450 --- /dev/null 24249 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c24451 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 24250 24452 @@ -0,0 +1,192 @@ 24251 24453 +/*- … … 24441 24643 + return A_OK; 24442 24644 +} 24443 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c24645 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 24444 24646 =================================================================== 24445 24647 --- /dev/null 24446 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c24648 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 24447 24649 @@ -0,0 +1,59 @@ 24448 24650 +/* … … 24505 24707 + return (freq - 5000) / 5; 24506 24708 +} 24507 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi.c24709 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 24508 24710 =================================================================== 24509 24711 --- /dev/null 24510 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi.c24712 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 24511 24713 @@ -0,0 +1,3921 @@ 24512 24714 +/* … … 28431 28633 +} 28432 28634 + 28433 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h28635 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 28434 28636 =================================================================== 28435 28637 --- /dev/null 28436 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h28638 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 28437 28639 @@ -0,0 +1,4421 @@ 28438 28640 +/* … … 32857 33059 +===================================================================== 32858 33060 +#endif 32859 Index: linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h33061 Index: linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 32860 33062 =================================================================== 32861 33063 --- /dev/null 32862 +++ linux-2.6.24 -rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h33064 +++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 32863 33065 @@ -0,0 +1,71 @@ 32864 33066 +#ifndef _WMI_HOST_H_
Note: See TracChangeset
for help on using the changeset viewer.
