3316521a3cfacb4f33b7ef4ca75ea30893b8c7a0
[grml.org.git] / kernel-devel / ipw3945-for-2.6.16.patch
1 diff -urN ipw3945-0.0.73/ipw3945.c ipw3945-0.0.73.patched/ipw3945.c
2 --- ipw3945-0.0.73/ipw3945.c    2006-03-29 22:30:56.000000000 +0200
3 +++ ipw3945-0.0.73.patched/ipw3945.c    2006-03-30 00:47:44.000000000 +0200
4 @@ -10713,9 +10713,10 @@
5                 .len = le16_to_cpu(rx_hdr->len),
6                 .freq = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
7                     IEEE80211_24GHZ_BAND : IEEE80211_52GHZ_BAND,
8 -               .tsf = rx_end->timestamp,
9 -               .beacon_time = rx_end->beaconTimeStamp,
10 +//             .tsf = rx_end->timestamp,
11 +//             .beacon_time = rx_end->beaconTimeStamp,
12         };
13 +
14         u8 network_packet;
15         unsigned long flags;
16         u16 snr = 0;
17 @@ -10795,8 +10796,8 @@
18                 priv->last_rx_rssi = stats.rssi;
19  
20                 priv->last_rx_jiffies = jiffies;
21 -               priv->last_beacon_time = stats.beacon_time;
22 -               priv->last_tsf = stats.tsf;
23 +//             priv->last_beacon_time = stats.beacon_time;
24 +//             priv->last_tsf = stats.tsf;
25         }
26         spin_unlock_irqrestore(&priv->ieee->lock, flags);
27  
28 @@ -14187,8 +14188,7 @@
29  
30         atomic_inc(&crypt->refcnt);
31         if (crypt->ops->build_iv)
32 -               crypt->ops->build_iv(skb_frag, hdr_len,
33 -                                    tx_cmd->key, 16, crypt->priv);
34 +               crypt->ops->build_iv(skb_frag, hdr_len, crypt->priv);
35         atomic_dec(&crypt->refcnt);
36  
37         switch (priv->ieee->sec.level) {
38 diff -urN ipw3945-0.0.73/ipw3945.h ipw3945-0.0.73.patched/ipw3945.h
39 --- ipw3945-0.0.73/ipw3945.h    2006-03-29 22:30:56.000000000 +0200
40 +++ ipw3945-0.0.73.patched/ipw3945.h    2006-03-30 00:47:44.000000000 +0200
41 @@ -48,6 +48,14 @@
42  
43  #include <net/ieee80211.h>
44  
45 +#ifndef NETWORK_HAS_POWER_CONSTRAINT
46 +#define NETWORK_HAS_POWER_CONSTRAINT    (1<<5)
47 +#define NETWORK_HAS_CSA                 (1<<6)
48 +#define NETWORK_HAS_QUIET               (1<<7)
49 +#define NETWORK_HAS_IBSS_DFS            (1<<8)
50 +#define NETWORK_HAS_TPC_REPORT          (1<<9)
51 +#endif
52 +
53  #define DRV_NAME       "ipw3945"
54  
55  #include "ipw3945_daemon.h"
56 @@ -1972,7 +1980,7 @@
57  struct ipw_spectrum_list {
58         struct list_head list;
59         struct ieee80211_rx_stats stats;
60 -       struct ieee80211_action action[0];
61 +       //struct ieee80211_action action[0];
62  };
63  
64  #define IPW_IBSS_MAC_HASH_SIZE 31