package/zd1211/patches/100-linux_2.6.22.patch

   1 Index: zd1211-driver-r85/src/zd1205.c
   2 ===================================================================
   3 --- zd1211-driver-r85.orig/src/zd1205.c 2007-06-17 04:52:12.359529080 +0200
   4 +++ zd1211-driver-r85/src/zd1205.c      2007-06-17 04:52:18.626576344 +0200
   5 @@ -238,7 +238,9 @@
   6  //static int zd1205wext_siwtxpow(struct net_device *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra);
   7  static int zd1205wext_giwrange(struct net_device *dev, struct iw_request_info *info, struct iw_point *data, char *extra);
   8  /* ath_desc: use new get_wireless_stats in 2.6.10+ */
   9 +#if ((WIRELESS_EXT > 12) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)))
  10  struct iw_statistics *zd1205wext_iw_get_stats(struct net_device *dev);
  11 +#endif
  12
  13  /* ath_desc: add iwconfig commit support */
  14  #if WIRELESS_EXT > 12
  15 @@ -435,7 +437,7 @@
  16  struct iw_handler_def p80211wext_handler_def =
  17          {
  18  /* ath_desc: depend on wireless version, not kernel version */
  19 -#if WIRELESS_EXT > 16
  20 +#if ((WIRELESS_EXT > 16) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)))
  21                 .get_wireless_stats = &zd1205wext_iw_get_stats,
  22  #endif
  23          num_standard:
  24 @@ -4159,7 +4161,11 @@
  25                          skb->tail = skb->data = pHdr;
  26                          /* ath_desc: fix monitor mode frame length */
  27                          skb_put(skb, data_sz - PLCP_HEADER - EXTRA_INFO_LEN - CRC32_LEN);
  28 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
  29                          skb->mac.raw = skb->data;
  30 +#else
  31 +                                               skb_set_mac_header(skb, 0);
  32 +#endif
  33                          skb->pkt_type = PACKET_OTHERHOST;
  34                          skb->protocol = __constant_htons(ETH_P_802_2);
  35                          skb->dev = dev;
  36 @@ -4776,7 +4782,7 @@
  37   * updated, then they might be incorrect for a short while. However,
  38   * since this cannot actually cause damage, no locking is used.
  39   */
  40 -#if WIRELESS_EXT > 12
  41 +#if ((WIRELESS_EXT > 12) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)))
  42  struct iw_statistics *zd1205wext_iw_get_stats(struct net_device *dev)
  43  {
  44         struct zd1205_private *macp = dev->priv;