recipes/pandora-system/pandora-wifi/0002-More-cleanup-work-on-WEXT.-Now-at-the-point-that-use.patch

   1 From 313c5075ba5833b3cb544a3ed54f62e57b143fc4 Mon Sep 17 00:00:00 2001
   2 From: David-John Willis <John.Willis@Distant-earth.com>
   3 Date: Thu, 11 Jun 2009 09:42:00 +0100
   4 Subject: [PATCH 2/5] More cleanup work on WEXT. Now at the point that userspace may do something ;-).
   5
   6 ---
   7  sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c |  155 ++++++++++++----------------
   8  1 files changed, 68 insertions(+), 87 deletions(-)
   9
  10 diff --git a/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c b/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  11 index 0e28586..28011e8 100755
  12 --- a/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  13 +++ b/sta_dk_4_0_4_32/pform/linux/src/iw_ioctl.c
  14 @@ -32,7 +32,8 @@
  15  #include "scanMngrTypes.h"
  16  #include "scanMngrTypes.h"
  17
  18 -#define IOCTL_DBG 1
  19 +/* Enable to turn on function printk's */
  20 +#define IOCTL_DBG
  21
  22  static const long freq_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
  23                                   2447, 2452, 2457, 2462, 2467, 2472, 2484 };
  24 @@ -126,7 +127,7 @@ static int iw_get_name(struct net_device *dev,
  25  #if IOCTL_DBG
  26         printk("%s Call\n", __FUNCTION__);
  27  #endif
  28 -/*
  29 +/*
  30         u8 rates[10];
  31         int len, i, over2 = 0;
  32
  33 @@ -161,7 +162,7 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  34         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
  35         cipherSuite_e   cipher;
  36         int i;
  37 -       ULONG len;
  38 +       ULONG len;
  39
  40  #if IOCTL_DBG
  41         printk("%s Call\n", __FUNCTION__);
  42 @@ -180,7 +181,7 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  43                 return -EINVAL;
  44
  45         UtilWepStatusGet(pAdapter, (UINT8 *)&cipher, &len);
  46 -
  47 +
  48         if (erq->flags & IW_ENCODE_DISABLED) {
  49                 cipherSuite_e val=RSN_CIPHER_NONE;
  50                 UtilWepStatusSet(pAdapter, (UINT8 *)&val, sizeof(val));
  51 @@ -191,10 +192,10 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  52                 if (erq->length > 0) {
  53                         OS_802_11_WEP wep;
  54                         int len = erq->length <= 5 ? 5 : 13;
  55 -
  56 +
  57                         cipherSuite_e val=RSN_CIPHER_WEP;
  58                         UtilWepStatusSet(pAdapter, (UINT8 *)&val, sizeof(val));
  59 -
  60 +
  61                         if (len > erq->length)
  62                                 memset(keybuf + erq->length, 0, len - erq->length);
  63                         memcpy(wep.KeyMaterial, keybuf, len);
  64 @@ -206,7 +207,7 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  65                         /* No key data - just set the default TX key index */
  66                         securityKeys_t key;
  67                         UINT8 data[5];
  68 -
  69 +
  70                         memset(&key, 0, sizeof(securityKeys_t));
  71                         key.keyIndex = i;
  72                         if (!UtilWepKeyGet(pAdapter, (UINT8 *)&key, sizeof(securityKeys_t)))
  73 @@ -223,13 +224,13 @@ static int iw_ioctl_siwencode(struct net_device *dev,
  74                                         }
  75                                 }
  76                                 else
  77 -                                       return -EINVAL;
  78 +                                       return -EINVAL;
  79                         }
  80                         else
  81                                 return -EINVAL;
  82                 }
  83         }
  84 -done:
  85 +done:
  86         if (erq->flags & IW_ENCODE_OPEN)
  87         {
  88                 UINT8 MixedMode = true;
  89 @@ -289,7 +290,7 @@ static int iw_ioctl_giwencode(struct net_device *dev,
  90                 wkey.keyIndex = i;
  91                 if (!UtilWepKeyGet(pAdapter, (PUCHAR)&wkey, sizeof(securityKeys_t)))
  92                 {
  93 -               printk("iw_ioctl_giwencode KeyIndex  %x , keyLength=%d\n",
  94 +               printk("iw_ioctl_giwencode KeyIndex  %x , keyLength=%d\n",
  95                        wkey.keyIndex, wkey.encLen);
  96                         if (wkey.encLen > 0)
  97                         {
  98 @@ -320,8 +321,8 @@ static int iw_ioctl_giwencode(struct net_device *dev,
  99                 erq->flags |= IW_ENCODE_OPEN;
 100         else
 101                 erq->flags |= IW_ENCODE_RESTRICTED;
 102 -
 103 -
 104 +
 105 +
 106         return 0;
 107  }
 108
 109 @@ -331,7 +332,7 @@ static int iw_ioctl_siwrate(struct net_device *dev,
 110  {
 111         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 112         u32 val;
 113 -
 114 +
 115  #if IOCTL_DBG
 116         printk("%s Call\n", __FUNCTION__);
 117  #endif
 118 @@ -339,7 +340,7 @@ static int iw_ioctl_siwrate(struct net_device *dev,
 119                 val = 0;
 120         else
 121                 val = (rrq->value*2/1000000);
 122 -
 123 +
 124         return UtilDesiredRatesSet(pAdapter, (UINT8 *)&val, 4);
 125  }
 126
 127 @@ -377,7 +378,7 @@ static int iw_ioctl_giwaplist(struct net_device *dev,
 128                                   struct iw_request_info *info,
 129                                   struct iw_point *data, char *extra)
 130  {
 131 -
 132 +
 133  #if 1
 134         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 135         struct sockaddr addr[IW_MAX_AP];
 136 @@ -387,7 +388,7 @@ static int iw_ioctl_giwaplist(struct net_device *dev,
 137         OS_802_11_BSSID_EX *bssid;
 138         OS_802_11_BSSID_LIST_EX *list;
 139         int i;
 140 -
 141 +
 142  #if IOCTL_DBG
 143         printk("%s Call\n", __FUNCTION__);
 144  #endif
 145 @@ -400,9 +401,9 @@ static int iw_ioctl_giwaplist(struct net_device *dev,
 146      printk("bssid 0x%x\n",(unsigned int)bssid);
 147      number_items = list->NumberOfItems;
 148      printk("number_items 0x%x\n",number_items);
 149 -
 150 +
 151         data->length = number_items;
 152 -
 153 +
 154         for (i=0;i<number_items;i++)
 155         {
 156                 addr[i].sa_family = ARPHRD_ETHER;
 157 @@ -414,7 +415,7 @@ static int iw_ioctl_giwaplist(struct net_device *dev,
 158                 qual[i].updated = 7;
 159          bssid = (OS_802_11_BSSID_EX *) (((char *) bssid) + bssid->Length);
 160         }
 161 -
 162 +
 163         memcpy(extra, &addr, sizeof(addr[0]) * data->length);
 164         data->flags = 1; /* has quality information */
 165         memcpy(extra + sizeof(addr[0]) * data->length, &qual,
 166 @@ -443,7 +444,7 @@ static int iw_ioctl_siwrts(struct net_device *dev,
 167                 val = rts->value;
 168
 169         UtilRtsThresholdSet(pAdapter, (UINT8 *)&val, 4);
 170 -
 171 +
 172         return 0;
 173  }
 174
 175 @@ -564,7 +565,7 @@ static int iw_ioctl_siwfreq(struct net_device *dev,
 176  #endif
 177         if (freq->m == -1)
 178                 return -EOPNOTSUPP;
 179 -
 180 +
 181         /* freq => chan. */
 182         if (freq->e == 1 &&
 183             freq->m / 100000 >= freq_list[0] &&
 184 @@ -597,7 +598,6 @@ static int iw_ioctl_giwfreq(struct net_device *dev, struct iw_request_info *info
 185         printk("%s Call\n", __FUNCTION__);
 186  #endif
 187         if (!pAdapter->CoreHalCtx) {
 188 -               printk("CJP: CoreHalCtx is NULL - config Mgr has vanished???\n");
 189                 return -EINVAL;
 190         }
 191
 192 @@ -615,7 +615,7 @@ static int iw_ioctl_giwfreq(struct net_device *dev, struct iw_request_info *info
 193  static int iw_ioctl_siwessid(struct net_device *dev,
 194                                  struct iw_request_info *info,
 195                                  struct iw_point *data, char *ssid)
 196 -{
 197 +{
 198         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 199         OS_802_11_SSID essid;
 200         OS_802_11_MAC_ADDRESS bssid = { 0xff,0xff,0xff,0xff,0xff,0xff };
 201 @@ -653,7 +653,7 @@ static int iw_ioctl_giwessid(struct net_device *dev,
 202         UtilGetSSID(pAdapter, (UINT8 *)&ssid, &len);
 203         data->length = ssid.SsidLength;
 204         memcpy(essid, ssid.Ssid, ssid.SsidLength);
 205 -
 206 +
 207         return 0;
 208  }
 209
 210 @@ -684,9 +684,9 @@ static int iw_ioctl_siwmode(struct net_device *dev,
 211         default:
 212                 val = 1;
 213         }
 214 -
 215 +
 216      UtilInfrastructureModeSet(pAdapter, (UINT8 *)&val, 4);
 217 -
 218 +
 219         return 0;
 220  }
 221
 222 @@ -855,7 +855,7 @@ static int iw_ioctl_siwpower(struct net_device *dev,
 223  {
 224         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 225         UINT32 val=POWER_MODE_ACTIVE;
 226 -
 227 +
 228  #if IOCTL_DBG
 229         printk("%s Call\n", __FUNCTION__);
 230  #endif
 231 @@ -897,12 +897,12 @@ static int iw_ioctl_giwpower(struct net_device *dev,
 232  #if 0  // cjp
 233         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 234         UINT32 val=POWER_MODE_ACTIVE, len;
 235 -
 236 +
 237  #if IOCTL_DBG
 238         printk("%s Call\n", __FUNCTION__);
 239  #endif
 240         UtilPowerModeGet(pAdapter, (UINT8 *)&val, &len);
 241 -
 242 +
 243         if (val==POWER_MODE_ACTIVE) {
 244                 rrq->disabled = 1;
 245                 return 0;
 246 @@ -919,7 +919,7 @@ static int iw_ioctl_siwretry(struct net_device *dev,
 247                                  struct iw_param *rrq, char *extra)
 248  {
 249         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 250 -
 251 +
 252  #if IOCTL_DBG
 253         printk("%s Call\n", __FUNCTION__);
 254  #endif
 255 @@ -948,11 +948,11 @@ static int iw_ioctl_giwretry(struct net_device *dev,
 256         PTIWLN_ADAPTER_T pAdapter = &(((tiwlan_net_dev_t *)(dev->priv))->adapter);
 257         u16 shortretry, longretry;
 258         ULONG len;
 259 -
 260 +
 261  #if IOCTL_DBG
 262         printk("%s Call\n", __FUNCTION__);
 263  #endif
 264 -       if (UtilShortRetryGet(pAdapter, (UINT8 *)&shortretry, &len)!=0 ||
 265 +       if (UtilShortRetryGet(pAdapter, (UINT8 *)&shortretry, &len)!=0 ||
 266                 UtilLongRetryGet(pAdapter, (UINT8 *)&longretry, &len)!=0)
 267                 return -EINVAL;
 268
 269 @@ -1015,12 +1015,12 @@ static int iw_ioctl_siwscan(struct net_device *dev,
 270  #if IOCTL_DBG
 271         printk("%s Call\n", __FUNCTION__);
 272  #endif
 273 -
 274 +
 275         scan_TimeStamp = jiffies;
 276         init_scan_params();
 277 -
 278 +
 279         ret = UtilStartAppScanSet(pAdapter, (PCHAR)&iw_appScanParams, sizeof(iw_appScanParams));
 280 -
 281 +
 282         return ret;
 283  }
 284
 285 @@ -1055,7 +1055,7 @@ static inline int iw_scan_list(struct net_device *dev,
 286      list = (OS_802_11_BSSID_LIST_EX *) list_buf;
 287      bssid = &list->Bssid[0];
 288      number_items = list->NumberOfItems;
 289 -
 290 +
 291         spin_lock_bh(&lock);
 292         for (i=0;i<number_items;i++)
 293         {
 294 @@ -1066,7 +1066,7 @@ static inline int iw_scan_list(struct net_device *dev,
 295                 iwe.len = IW_EV_ADDR_LEN;
 296                 current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,
 297                                                   IW_EV_ADDR_LEN);
 298 -
 299 +
 300                 memset(&iwe, 0, sizeof(iwe));
 301                 iwe.cmd = SIOCGIWESSID;
 302                 iwe.u.data.length = bssid->Ssid.SsidLength;
 303 @@ -1074,7 +1074,7 @@ static inline int iw_scan_list(struct net_device *dev,
 304                 iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
 305                 printk("essid=%s len=%d\n", bssid->Ssid.Ssid, bssid->Ssid.SsidLength);
 306                 current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, (char *)bssid->Ssid.Ssid);
 307 -
 308 +
 309                 memset(&iwe, 0, sizeof(iwe));
 310                 iwe.cmd = SIOCGIWMODE;
 311                 capabilities = bssid->Union.Capabilities;
 312 @@ -1088,7 +1088,7 @@ static inline int iw_scan_list(struct net_device *dev,
 313                         current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,
 314                                                           IW_EV_UINT_LEN);
 315                 }
 316 -
 317 +
 318                 memset(&iwe, 0, sizeof(iwe));
 319                 iwe.cmd = SIOCGIWFREQ;
 320                 chan = bssid->Configuration.Union.channel;
 321 @@ -1099,7 +1099,7 @@ static inline int iw_scan_list(struct net_device *dev,
 322                         current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,
 323                                                           IW_EV_FREQ_LEN);
 324                 }
 325 -
 326 +
 327                 memset(&iwe, 0, sizeof(iwe));
 328                 iwe.cmd = IWEVQUAL;
 329                 iwe.u.qual.qual = bssid->Rssi;
 330 @@ -1121,7 +1121,7 @@ static inline int iw_scan_list(struct net_device *dev,
 331                 iwe.u.data.length = 0;
 332                 iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
 333                 current_ev = iwe_stream_add_point(info, current_ev, end_buf, &iwe, "");
 334 -
 335 +
 336                 /* TODO: add SuppRates into BSS table */
 337                 memset(&iwe, 0, sizeof(iwe));
 338                 iwe.cmd = SIOCGIWRATE;
 339 @@ -1139,7 +1139,7 @@ static inline int iw_scan_list(struct net_device *dev,
 340                 /* Check if we added any event */
 341                 if ((current_val - current_ev) > IW_EV_LCP_LEN)
 342                         current_ev = current_val;
 343 -
 344 +
 345                 /* TODO: add BeaconInt,resp_rate,atim into BSS table */
 346                 memset(&iwe, 0, sizeof(iwe));
 347                 iwe.cmd = IWEVCUSTOM;
 348 @@ -1157,14 +1157,14 @@ static inline int iw_scan_list(struct net_device *dev,
 349                         current_ev = iwe_stream_add_point(info, current_ev, end_buf,
 350                                                           &iwe, buf);
 351                 }
 352 -
 353 +
 354  #if 1
 355                 IELen = 0;
 356          IELen += sizeof(OS_802_11_FIXED_IEs);
 357          pVarIes = (OS_802_11_VARIABLE_IEs*)&bssid->IEs[IELen];
 358                 while (IELen < bssid->IELength)
 359                 {
 360 -                       printk("IELen=%d pVarIes->ElementID=%d\n", IELen, pVarIes->ElementID);
 361 +                       printk("IELen=%d pVarIes->ElementID=%d\n", IELen, pVarIes->ElementID);
 362                         if (pVarIes->ElementID == MFIE_TYPE_RSN || pVarIes->ElementID == MFIE_TYPE_GENERIC) {
 363                                 memset(&iwe, 0, sizeof(iwe));
 364                                 iwe.cmd = IWEVGENIE;
 365 @@ -1172,11 +1172,11 @@ static inline int iw_scan_list(struct net_device *dev,
 366                                 current_ev = iwe_stream_add_point(
 367                                                 info, current_ev, end_buf, &iwe, (char *)pVarIes);
 368                         }
 369 -
 370 -            IELen += (pVarIes->Length + 2);
 371 +
 372 +            IELen += (pVarIes->Length + 2);
 373                 pVarIes = (OS_802_11_VARIABLE_IEs*)&bssid->IEs[IELen];
 374                 }
 375 -#endif
 376 +#endif
 377                 if ((end_buf - current_ev) <= IW_EV_ADDR_LEN) {
 378                         /* Ask user space to try again with a bigger buffer */
 379                         spin_unlock_bh(&lock);
 380 @@ -1185,7 +1185,7 @@ static inline int iw_scan_list(struct net_device *dev,
 381                 printk("current_ev=%x\n", current_ev);
 382          bssid = (OS_802_11_BSSID_EX *) (((char *) bssid) + bssid->Length);
 383         }
 384 -
 385 +
 386         spin_unlock_bh(&lock);
 387         return current_ev - extra;
 388  }
 389 @@ -1213,7 +1213,7 @@ static int iw_ioctl_giwscan(struct net_device *dev,
 390         }
 391
 392         res = iw_scan_list(dev, info, data, extra);
 393 -//     printk("iw_ioctl_giwscan end res=%d\n", res);
 394 +       printk("iw_ioctl_giwscan end res=%d\n", res);
 395         if (res >= 0) {
 396                 data->length = res;
 397                 return 0;
 398 @@ -1505,7 +1505,7 @@ static int iw_ioctl_siwauth(struct net_device *dev,
 399         }
 400         return 0;
 401  #endif
 402 -       return -EOPNOTSUPP;
 403 +       return -EOPNOTSUPP;
 404  }
 405
 406
 407 @@ -1548,7 +1548,7 @@ static int iw_ioctl_giwauth(struct net_device *dev,
 408         }
 409         return 0;
 410  #endif
 411 -       return -EOPNOTSUPP;
 412 +       return -EOPNOTSUPP;
 413  }
 414
 415
 416 @@ -1560,7 +1560,7 @@ static int iw_ioctl_siwencodeext(struct net_device *dev,
 417  #if IOCTL_DBG
 418         printk("%s Call\n", __FUNCTION__);
 419  #endif
 420 -#if 0
 421 +#if 0
 422         struct hostap_interface *iface = dev->priv;
 423         local_info_t *local = iface->local;
 424         struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
 425 @@ -1726,7 +1726,7 @@ static int iw_ioctl_siwencodeext(struct net_device *dev,
 426
 427         return ret;
 428  #endif
 429 -       return -EOPNOTSUPP;
 430 +       return -EOPNOTSUPP;
 431  }
 432
 433
 434 @@ -1737,7 +1737,7 @@ static int iw_ioctl_giwencodeext(struct net_device *dev,
 435  #if IOCTL_DBG
 436         printk("%s Call\n", __FUNCTION__);
 437  #endif
 438 -#if 0
 439 +#if 0
 440         struct hostap_interface *iface = dev->priv;
 441         local_info_t *local = iface->local;
 442         struct prism2_crypt_data **crypt;
 443 @@ -1802,7 +1802,7 @@ static int iw_ioctl_giwencodeext(struct net_device *dev,
 444
 445         return 0;
 446  #endif
 447 -       return -EOPNOTSUPP;
 448 +       return -EOPNOTSUPP;
 449  }
 450  #endif /* WIRELESS_EXT > 17 */
 451
 452 @@ -1846,7 +1846,7 @@ static int iw_ioctl_siwmlme(struct net_device *dev,
 453
 454  static const iw_handler ti_handler[] =
 455  {
 456 -       (iw_handler) iw_ioctl_commit,                                           /* SIOCSIWCOMMIT */
 457 +       (iw_handler) NULL,                                              /* SIOCSIWCOMMIT */
 458         (iw_handler) iw_get_name,                               /* SIOCGIWNAME */
 459         (iw_handler) NULL,                                              /* SIOCSIWNWID */
 460         (iw_handler) NULL,                                              /* SIOCGIWNWID */
 461 @@ -1854,33 +1854,22 @@ static const iw_handler ti_handler[] =
 462         (iw_handler) iw_ioctl_giwfreq,                  /* SIOCGIWFREQ */
 463         (iw_handler) iw_ioctl_siwmode,                  /* SIOCSIWMODE */
 464         (iw_handler) iw_ioctl_giwmode,                  /* SIOCGIWMODE */
 465 -       (iw_handler) NULL,      //iw_ioctl_siwsens,                     /* SIOCSIWSENS */
 466 -       (iw_handler) NULL,      //iw_ioctl_giwsens,                     /* SIOCGIWSENS */
 467 -       (iw_handler) NULL /* not used */,               /* SIOCSIWRANGE */
 468 +       (iw_handler) NULL,                                              /* SIOCSIWSENS - iw_ioctl_siwsens, */
 469 +       (iw_handler) NULL,                                              /* SIOCGIWSENS - iw_ioctl_giwsens, */
 470 +       (iw_handler) NULL,                                              /* SIOCSIWRANGE */
 471         (iw_handler) iw_ioctl_giwrange,                 /* SIOCGIWRANGE */
 472 -       (iw_handler) NULL /* not used */,               /* SIOCSIWPRIV */
 473 -       (iw_handler) NULL /* kernel code */,    /* SIOCGIWPRIV */
 474 -       (iw_handler) NULL /* not used */,               /* SIOCSIWSTATS */
 475 -       (iw_handler) NULL /* kernel code */,    /* SIOCGIWSTATS */
 476 -#if WIRELESS_EXT > 15
 477 -       iw_handler_set_thrspy,                                  /* SIOCSIWTHRSPY */
 478 -       iw_handler_get_thrspy,                                  /* SIOCGIWTHRSPY */
 479 +       (iw_handler) NULL,                                              /* SIOCSIWPRIV */
 480 +       (iw_handler) NULL,                                              /* SIOCGIWPRIV */
 481 +       (iw_handler) NULL,                                              /* SIOCSIWSTATS */
 482 +       (iw_handler) NULL,                                              /* SIOCGIWSTATS */
 483         iw_handler_set_spy,                                             /* SIOCSIWSPY */
 484         iw_handler_get_spy,                                             /* SIOCGIWSPY */
 485 -#else /* WIRELESS_EXT > 15 */
 486 -       (iw_handler) NULL,                                              /* SIOCSIWSPY */
 487 -       (iw_handler) NULL,                                              /* SIOCGIWSPY */
 488 -       (iw_handler) NULL,                                              /* -- hole -- */
 489 -       (iw_handler) NULL,                                              /* -- hole -- */
 490 -#endif /* WIRELESS_EXT > 15 */
 491 +       iw_handler_set_thrspy,                                  /* SIOCSIWTHRSPY */
 492 +       iw_handler_get_thrspy,                                  /* SIOCGIWTHRSPY */
 493         (iw_handler) iw_ioctl_siwap,                    /* SIOCSIWAP */
 494         (iw_handler) iw_ioctl_giwap,                    /* SIOCGIWAP */
 495 -#if WIRELESS_EXT > 17
 496         (iw_handler) iw_ioctl_siwmlme,                  /* SIOCSIWMLME */
 497 -#else /* WIRELESS_EXT > 17 */
 498 -       (iw_handler) NULL,                              /* -- hole -- */
 499 -#endif /* WIRELESS_EXT > 17 */
 500 -       (iw_handler) iw_ioctl_giwaplist,                /* SIOCGIWAPLIST */
 501 +       (iw_handler) iw_ioctl_giwaplist,                /* SIOCGIWAPLIST - Deprecated */
 502         (iw_handler) iw_ioctl_siwscan,                  /* SIOCSIWSCAN */
 503         (iw_handler) iw_ioctl_giwscan,                  /* SIOCGIWSCAN */
 504         (iw_handler) iw_ioctl_siwessid,                 /* SIOCSIWESSID */
 505 @@ -1903,7 +1892,6 @@ static const iw_handler ti_handler[] =
 506         (iw_handler) iw_ioctl_giwencode,                /* SIOCGIWENCODE */
 507         (iw_handler) iw_ioctl_siwpower,                 /* SIOCSIWPOWER */
 508         (iw_handler) iw_ioctl_giwpower,                 /* SIOCGIWPOWER */
 509 -#if WIRELESS_EXT > 17
 510         (iw_handler) NULL,                                              /* -- hole -- */
 511         (iw_handler) NULL,                                              /* -- hole -- */
 512         (iw_handler) iw_ioctl_siwgenie,                 /* SIOCSIWGENIE */
 513 @@ -1913,8 +1901,6 @@ static const iw_handler ti_handler[] =
 514         (iw_handler) iw_ioctl_siwencodeext,             /* SIOCSIWENCODEEXT */
 515         (iw_handler) iw_ioctl_giwencodeext,             /* SIOCGIWENCODEEXT */
 516         (iw_handler) NULL,                                              /* SIOCSIWPMKSA */
 517 -       (iw_handler) NULL,                                              /* -- hole -- */
 518 -#endif /* WIRELESS_EXT > 17 */
 519  };
 520
 521  #if 0
 522 @@ -1935,16 +1921,11 @@ static const struct iw_handler_def ti_iw_handler_def =
 523         .standard       = (iw_handler *) ti_handler,
 524  //     .private        = (iw_handler *) ti_private_handler,
 525  //     .private_args   = (struct iw_priv_args *) ti_priv,
 526 -#if WIRELESS_EXT == 16
 527 -//     .spy_offset     = offsetof(struct hostap_interface, spy_data),
 528 -#endif /* WIRELESS_EXT == 16 */
 529 -#if WIRELESS_EXT > 16
 530 -//     .get_wireless_stats = ti_get_wireless_stats,
 531 -#endif /* WIRELESS_EXT > 16 */
 532 +       .get_wireless_stats = ti_get_wireless_stats,
 533  };
 534
 535  void tiwlan_iwhandler_init(struct net_device *dev)
 536  {
 537     dev->wireless_handlers = (struct iw_handler_def *) &ti_iw_handler_def;
 538 -   printk("CJP: wext start :: tiwlan_iwhandler_init");
 539 +   printk("TIWLAN :: Wireless Extentions Active");
 540  }
 541 --
 542 1.6.3.1
 543