rpms/kernel/devel git-iwlwifi.patch, 1.12, 1.13 git-wireless-dev.patch, 1.17, 1.18 kernel-2.6.spec, 1.3296, 1.3297 linux-2.6-rtl8187.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jul 11 18:12:51 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15286
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
Added Files:
git-iwlwifi.patch
Removed Files:
linux-2.6-rtl8187.patch
Log Message:
update iwlwifi from Intel's tree...grrr...
git-iwlwifi.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 git-iwlwifi.patch
Index: git-iwlwifi.patch
===================================================================
RCS file: git-iwlwifi.patch
diff -N git-iwlwifi.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ git-iwlwifi.patch 11 Jul 2007 18:12:44 -0000 1.13
@@ -0,0 +1,5808 @@
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h 2007-07-11 13:53:43.000000000 -0400
+@@ -136,13 +136,15 @@ static inline int is_channel_radar(const
+
+ static inline u8 is_channel_a_band(const struct iwl_channel_info *ch_info)
+ {
+- return (ch_info->phymode == MODE_IEEE80211A) ? 1 : 0;
++ return ((ch_info->phymode == MODE_IEEE80211A) ||
++ (ch_info->phymode == MODE_ATHEROS_TURBO)) ? 1 : 0;
+ }
+
+ static inline u8 is_channel_bg_band(const struct iwl_channel_info *ch_info)
+ {
+- return (ch_info->phymode == MODE_IEEE80211B ||
+- ch_info->phymode == MODE_IEEE80211G) ? 1 : 0;
++ return ((ch_info->phymode == MODE_IEEE80211B) ||
++ (ch_info->phymode == MODE_IEEE80211G) ||
++ (ch_info->phymode == MODE_ATHEROS_TURBOG)) ? 1 : 0;
+ }
+
+ static inline int is_channel_passive(const struct iwl_channel_info *ch)
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-07-11 13:53:43.000000000 -0400
+@@ -2,7 +2,7 @@
+ # specific binaries based on the #define IWL -- the target
+ # setup below creates a specific driver target from base.c
+ #
+-# NOTE2: base-XXXX.o has -D"KBUILD_MODNAME=KBUILD_STR(...)" in order to
++# NOTE2: base-XXXX.o has -D"KBUILD_MODNAME=KBUILD_STR(...)" in order to
+ # prevent the following kbuild error:
+ # include/linux/pci.h:603: error: `KBUILD_MODNAME' undeclared (first \
+ # use in this function)
+@@ -11,8 +11,8 @@
+
+ obj-$(CONFIG_IWL3945) += iwl3945.o
+ iwl3945-objs = base-3945.o iwl-3945.o iwl-3945-rs.o
+-CFLAGS_iwl-3945-rs.o = -DIWL=3945
+ CFLAGS_iwl-3945.o = -DIWL=3945
++CFLAGS_iwl-3945-rs.o = -DIWL=3945
+ CFLAGS_base-3945.o = -DIWL=3945 -D"KBUILD_MODNAME=KBUILD_STR(iwl3945)"
+ $(obj)/base-3945.o: $(src)/base.c FORCE
+ $(call cmd,force_checksrc)
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c 2007-07-11 13:53:43.000000000 -0400
+@@ -52,13 +52,16 @@
+ #define IWL_HT_NUMBER_TRY 1
+
+ #define IWL_RATE_MAX_WINDOW 62
+-#define IWL_RATE_HIGH_TH 11520
+-#define IWL_RATE_MIN_FAILURE_TH 3
++#define IWL_RATE_HIGH_TH 10880
++#define IWL_RATE_MIN_FAILURE_TH 6
+ #define IWL_RATE_MIN_SUCCESS_TH 8
+ #define IWL_RATE_DECREASE_TH 1920
++#define IWL_RATE_INCREASE_TH 8960
+ #define IWL_RATE_SCALE_FLUSH_INTVL (2*HZ) /*2 seconds */
+
+ static u8 rs_ht_to_legacy[] = {
++ IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
++ IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
+ IWL_RATE_6M_INDEX,
+ IWL_RATE_6M_INDEX, IWL_RATE_9M_INDEX,
+ IWL_RATE_12M_INDEX, IWL_RATE_18M_INDEX,
+@@ -126,43 +129,43 @@ static int rs_fill_link_cmd(struct iwl_r
+
+
+ static s32 expected_tpt_A[IWL_RATE_COUNT] = {
+- 40, 57, 72, 98, 121, 154, 177, 186, 186, 0, 0, 0, 0
++ 0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186, 186
+ };
+
+ static s32 expected_tpt_G[IWL_RATE_COUNT] = {
+- 40, 57, 72, 98, 121, 154, 177, 186, 186, 7, 13, 35, 58
++ 7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 186
+ };
+
+ static s32 expected_tpt_siso20MHz[IWL_RATE_COUNT] = {
+- 42, 42, 76, 102, 124, 159, 183, 193, 202, 0, 0, 0, 0
++ 0, 0, 0, 0, 42, 42, 76, 102, 124, 159, 183, 193, 202
+ };
+
+ static s32 expected_tpt_siso20MHzSGI[IWL_RATE_COUNT] = {
+- 46, 46, 82, 110, 132, 168, 192, 202, 211, 0, 0, 0, 0
++ 0, 0, 0, 0, 46, 46, 82, 110, 132, 168, 192, 202, 211
+ };
+
+ static s32 expected_tpt_mimo20MHz[IWL_RATE_COUNT] = {
+- 74, 74, 123, 155, 179, 214, 236, 244, 251, 0, 0, 0, 0
++ 0, 0, 0, 0, 74, 74, 123, 155, 179, 214, 236, 244, 251
+ };
+
+ static s32 expected_tpt_mimo20MHzSGI[IWL_RATE_COUNT] = {
+- 81, 81, 131, 164, 188, 222, 243, 251, 257, 0, 0, 0, 0
++ 0, 0, 0, 0, 81, 81, 131, 164, 188, 222, 243, 251, 257
+ };
+
+ static s32 expected_tpt_siso40MHz[IWL_RATE_COUNT] = {
+- 77, 77, 127, 160, 184, 220, 242, 250, 257, 0, 0, 0, 0
++ 0, 0, 0, 0, 77, 77, 127, 160, 184, 220, 242, 250, 257
+ };
+
+ static s32 expected_tpt_siso40MHzSGI[IWL_RATE_COUNT] = {
+- 83, 83, 135, 169, 193, 229, 250, 257, 264, 0, 0, 0, 0
++ 0, 0, 0, 0, 83, 83, 135, 169, 193, 229, 250, 257, 264
+ };
+
+ static s32 expected_tpt_mimo40MHz[IWL_RATE_COUNT] = {
+- 123, 123, 182, 214, 235, 264, 279, 285, 289, 0, 0, 0, 0
++ 0, 0, 0, 0, 123, 123, 182, 214, 235, 264, 279, 285, 289
+ };
+
+ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = {
+- 131, 131, 191, 222, 242, 270, 284, 289, 293, 0, 0, 0, 0
++ 0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293
+ };
+
+ static int iwl_lq_sync_callback(struct iwl_priv *priv,
+@@ -226,12 +229,13 @@ static int rs_rate_scale_clear_window(st
+ }
+
+ static int rs_collect_tx_data(struct iwl_rate_scale_data *windows,
+- int scale_index, u32 status)
++ int scale_index, s32 tpt, u32 status)
+ {
+ int rc = 0;
+ struct iwl_rate_scale_data *window = NULL;
+ u64 mask;
+ u8 win_size = IWL_RATE_MAX_WINDOW;
++ s32 fail_count;
+
+ if (scale_index < 0)
+ return -1;
+@@ -266,6 +270,15 @@ static int rs_collect_tx_data(struct iwl
+ } else
+ window->success_ratio = IWL_INVALID_VALUE;
+
++
++ fail_count = window->counter - window->success_counter;
++ if ((fail_count >= IWL_RATE_MIN_FAILURE_TH) ||
++ (window->success_counter >= IWL_RATE_MIN_SUCCESS_TH))
++ window->average_tpt = ((window->success_ratio *
++ tpt + 64) / 128);
++ else
++ window->average_tpt = IWL_INVALID_VALUE;
++
+ window->stamp = jiffies;
+
+ return rc;
+@@ -283,13 +296,13 @@ int static rs_mcs_from_tbl(struct iwl_ra
+ mcs_rate->rate_n_flags |= RATE_MCS_CCK_MSK;
+
+ } else if (is_siso(tbl->lq_type)) {
+- if (index > 8)
+- index = 8;
++ if (index > IWL_LAST_OFDM_RATE)
++ index = IWL_LAST_OFDM_RATE;
+ mcs_rate->rate_n_flags = iwl_rates[index].plcp_siso |
+ RATE_MCS_HT_MSK;
+ } else {
+- if (index > 8)
+- index = 8;
++ if (index > IWL_LAST_OFDM_RATE)
++ index = IWL_LAST_OFDM_RATE;
+ mcs_rate->rate_n_flags = iwl_rates[index].plcp_mimo |
+ RATE_MCS_HT_MSK;
+ }
+@@ -569,7 +582,7 @@ static void rs_tx_status(void *priv_rate
+ {
+ int status;
+ u8 retries;
+- int scale_rate_index, index = 0;
++ int rs_index, index = 0;
+ struct iwl_rate_scale_priv *lq;
+ struct iwl_link_quality_cmd *table;
+ struct sta_info *sta;
+@@ -582,14 +595,19 @@ static void rs_tx_status(void *priv_rate
+ struct iwl_scale_tbl_info tbl_type;
+ struct iwl_scale_tbl_info *curr_tbl, *search_tbl;
+ u8 active_index = 0;
++ u16 fc = le16_to_cpu(hdr->frame_control);
++ s32 tpt = 0;
+
+ IWL_DEBUG_RATE("getting frame ack response, update rate "
+ "scale window\n");
+
++ if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
++ return;
++
+ retries = tx_resp->retry_count;
+
+- if (retries > 16)
+- retries = 16;
++ if (retries > 15)
[...5415 lines suppressed...]
++ __le16 sensitivity_tbl[HD_TABLE_SIZE];
++#endif /*CONFIG_IWLWIFI_SENSITIVITY*/
+
+ #ifdef CONFIG_IWLWIFI_HT
+ struct sta_ht_info current_assoc_ht;
+@@ -184,6 +181,8 @@ struct iwl_priv {
+
+ int quality;
+ int last_rx_rssi;
++ int last_rx_noise;
++ int last_rx_snr;
+
+ struct iwl_power_mgr power_data;
+
+@@ -234,7 +233,7 @@ struct iwl_priv {
+ /* Last Rx'd beacon timestamp */
+ u32 timestamp0;
+ u32 timestamp1;
+-
++ u16 beacon_int;
+ struct iwl_driver_hw_info hw_setting;
+ int interface_id;
+
+@@ -255,18 +254,18 @@ struct iwl_priv {
+ struct work_struct abort_scan;
+ struct work_struct update_link_led;
+ struct work_struct auth_work;
+- struct work_struct post_associate;
+ struct work_struct report_work;
+ struct work_struct request_scan;
+
+ struct tasklet_struct irq_tasklet;
+
++ struct delayed_work init_alive_start;
+ struct delayed_work alive_start;
+ struct delayed_work activity_timer;
+ struct delayed_work thermal_periodic;
+ struct delayed_work gather_stats;
+ struct delayed_work scan_check;
+- struct delayed_work resume_work;
++ struct delayed_work post_associate;
+
+ #define IWL_DEFAULT_TX_POWER 0x0F
+ s8 user_txpower_limit;
+@@ -277,9 +276,6 @@ struct iwl_priv {
+ u32 pm_state[16];
+ #endif
+
+- /* Used to pass the current INTA value from ISR to Tasklet */
+- u32 isr_inta;
+-
+ /* debugging info */
+ u32 framecnt_to_us;
+
+@@ -287,10 +283,10 @@ struct iwl_priv {
+
+ #if IWL == 4965
+ struct work_struct txpower_work;
++#ifdef CONFIG_IWLWIFI_SENSITIVITY
+ struct work_struct sensitivity_work;
++#endif
+ struct work_struct statistics_work;
+- struct delayed_work init_alive_start;
+-
+ struct timer_list statistics_periodic;
+
+ #ifdef CONFIG_IWLWIFI_HT_AGG
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h 2007-07-11 13:53:43.000000000 -0400
+@@ -58,7 +58,12 @@ static inline void iwl4965_update_rate_s
+ static inline void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index,
+ u8 need_to_lock) {}
+ static inline void iwl4965_chain_noise_calibrate(struct iwl_priv *priv) {}
+-static inline void iwl4965_init_sensitivity(struct iwl_priv *priv) {}
++static inline void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags) {}
++static inline int iwl4965_set_fat_chan_info(struct iwl_priv *priv, int phymode,
++ int channel,
++ const struct iwl_eeprom_channel *eeprom_ch,
++ u8 fat_extension_channel) { return 0; }
++static inline void iwl4965_rf_kill_ct_config(struct iwl_priv *priv) {}
+ #else /* IWL == 4965 */
+ /*
+ * Forward declare iwl-4965.c functions for base.c
+@@ -84,7 +89,12 @@ extern void iwl4965_set_ht_add_station(s
+ u8 index, u8 need_to_lock);
+
+ extern void iwl4965_chain_noise_calibrate(struct iwl_priv *priv);
+-extern void iwl4965_init_sensitivity(struct iwl_priv *priv);
++extern void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags);
++extern int iwl4965_set_fat_chan_info(struct iwl_priv *priv, int phymode,
++ int channel,
++ const struct iwl_eeprom_channel *eeprom_ch,
++ u8 fat_extension_channel);
++extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);
+ /* Structures, enum, and defines specific to the 4965 */
+
+ #define IWL4965_KW_SIZE 0x1000 /*4k */
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-07-11 13:53:43.000000000 -0400
+@@ -452,10 +452,22 @@ struct iwl_station_entry {
+ struct iwl_hw_key keyinfo;
+ };
+
++/* one for each uCode image (inst/data, boot/init/runtime) */
+ struct fw_image_desc {
+- void *v_addr;
+- dma_addr_t p_addr;
+- u32 len;
++ void *v_addr; /* access by driver */
++ dma_addr_t p_addr; /* access by card's busmaster DMA */
++ u32 len; /* bytes */
++};
++
++/* uCode file layout */
++struct iwl_ucode {
++ __le32 ver; /* major/minor/subminor */
++ __le32 inst_size; /* bytes of runtime instructions */
++ __le32 data_size; /* bytes of runtime data */
++ __le32 init_size; /* bytes of initialization instructions */
++ __le32 init_data_size; /* bytes of initialization data */
++ __le32 boot_size; /* bytes of bootstrap instructions */
++ u8 data[0]; /* data in same order as "size" elements */
+ };
+
+ #define IWL_IBSS_MAC_HASH_SIZE 31
+@@ -506,13 +518,14 @@ struct iwl_driver_hw_info {
+
+ #define IWL_RX_HDR(x) ((struct iwl_rx_frame_hdr *)(\
+ x->u.rx_frame.stats.payload + \
+- x->u.rx_frame.stats.mib_count))
++ x->u.rx_frame.stats.phy_count))
+ #define IWL_RX_END(x) ((struct iwl_rx_frame_end *)(\
+ IWL_RX_HDR(x)->payload + \
+ le16_to_cpu(IWL_RX_HDR(x)->len)))
+ #define IWL_RX_STATS(x) (&x->u.rx_frame.stats)
+ #define IWL_RX_DATA(x) (IWL_RX_HDR(x)->payload)
+
++
+ /******************************************************************************
+ *
+ * Functions implemented in base.c which are forward declared here
+@@ -552,6 +565,8 @@ extern void iwl_rx_queue_free(struct iwl
+ extern int iwl_rx_queue_alloc(struct iwl_priv *priv);
+ extern void iwl_rx_queue_reset(struct iwl_priv *priv,
+ struct iwl_rx_queue *rxq);
++extern int iwl_calc_db_from_ratio(int sig_ratio);
++extern int iwl_calc_sig_qual(int rssi_dbm, int noise_dbm);
+ extern int iwl_tx_queue_init(struct iwl_priv *priv,
+ struct iwl_tx_queue *txq, int count, u32 id);
+ extern int iwl_rx_queue_restock(struct iwl_priv *priv);
+@@ -566,8 +581,6 @@ extern int iwl_fill_beacon_frame(struct
+ int left);
+ extern int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,
+ struct iwl_rx_queue *q);
+-extern int iwl_load_bsm(struct iwl_priv *priv, u8 * image, u32 len);
+-extern int iwl_verify_ucode(struct iwl_priv *priv);
+ extern int iwl_send_statistics_request(struct iwl_priv *priv);
+ extern void iwl_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
+ u32 decrypt_res,
+@@ -612,8 +625,6 @@ extern int iwl_hw_rxq_stop(struct iwl_pr
+ extern int iwl_hw_set_hw_setting(struct iwl_priv *priv);
+ extern int iwl_hw_nic_init(struct iwl_priv *priv);
+ extern void iwl_hw_card_show_info(struct iwl_priv *priv);
+-extern void iwl_hw_nic_start(struct iwl_priv *priv);
+-extern int iwl_hw_setup_bootstrap(struct iwl_priv *priv);
+ extern int iwl_hw_nic_stop_master(struct iwl_priv *priv);
+ extern void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
+ extern void iwl_hw_txq_ctx_stop(struct iwl_priv *priv);
+@@ -625,8 +636,6 @@ extern int iwl_hw_tx_queue_free_tfd(stru
+ extern int iwl_hw_get_temperature(struct iwl_priv *priv);
+ extern int iwl_tx_queue_free_tfd(struct iwl_priv *priv,
+ struct iwl_tx_queue *txq);
+-extern int iwl_hw_tx_queue_alloc(struct iwl_priv *priv,
+- struct iwl_tx_queue *q, int count, u32 id);
+ extern int iwl_hw_tx_queue_init(struct iwl_priv *priv,
+ struct iwl_tx_queue *txq);
+ extern int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
+@@ -639,10 +648,10 @@ extern void iwl_hw_build_tx_cmd_rate(str
+ int sta_id, int tx_id);
+ extern int iwl_hw_reg_send_txpower(struct iwl_priv *priv);
+ extern int iwl_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);
+-extern void iwl_hw_rx_reply_alive(struct iwl_priv *priv,
+- struct iwl_rx_mem_buffer *rxb);
+ extern void iwl_hw_rx_statistics(struct iwl_priv *priv,
+ struct iwl_rx_mem_buffer *rxb);
++extern void iwl_disable_events(struct iwl_priv *priv);
++extern int iwl4965_get_temperature(const struct iwl_priv *priv);
+
+ /**
+ * iwl_hw_find_station - Find station id for a given BSSID
+--- linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h.orig 2007-07-11 13:46:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h 2007-07-11 13:53:43.000000000 -0400
+@@ -150,6 +150,7 @@ BITC(x, 19), BITC(x, 18), BITC(x, 17), B
+ BIT_ARG16(x)
+
+ #define KELVIN_TO_CELSIUS(x) ((x)-273)
++#define CELSIUS_TO_KELVIN(x) ((x)+273)
+
+ #define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010
+
git-wireless-dev.patch:
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- git-wireless-dev.patch 11 Jul 2007 15:57:47 -0000 1.17
+++ git-wireless-dev.patch 11 Jul 2007 18:12:44 -0000 1.18
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-07-11 12:00:55.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -66,8 +66,8 @@
N: Lars Wirzenius
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.22.noarch/include/linux/nl80211.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -7,6 +7,217 @@
*/
@@ -343,8 +343,8 @@
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+
#endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -643,8 +643,8 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,387 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1033,8 +1033,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,163 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1199,8 +1199,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,47 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1249,8 +1249,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,294 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1546,8 +1546,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,108 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1657,8 +1657,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,422 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2082,8 +2082,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2226,8 +2226,8 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -300,7 +300,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
@@ -2294,8 +2294,8 @@
/* Setup beacon data for IBSS beacons. Unlike access point (Master),
* IBSS uses a fixed beacon frame which is configured using this
* function. This handler is required only for IBSS mode. */
---- linux-2.6.22.noarch/include/net/iw_handler.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/include/net/iw_handler.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-07-11 12:00:55.000000000 -0400
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -2311,8 +2311,8 @@
/* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig 2007-07-11 12:00:29.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS 2007-07-11 12:00:55.000000000 -0400
@@ -299,6 +299,14 @@ M: corentin.labbe at geomatys.fr
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -2404,7 +2404,7 @@
RANDOM NUMBER DRIVER
P: Matt Mackall
M: mpm at selenic.com
-@@ -3281,6 +3330,12 @@ M: tsbogend at alpha.franken.de
+@@ -3291,6 +3340,12 @@ M: tsbogend at alpha.franken.de
L: netdev at vger.kernel.org
S: Maintained
@@ -2417,8 +2417,8 @@
SONY VAIO CONTROL DEVICE DRIVER
P: Mattia Dongili
M: malattia at linux.it
---- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c 2007-07-11 12:00:55.000000000 -0400
@@ -182,14 +182,31 @@ void ieee80211_if_set_type(struct net_de
(unsigned long) sdata);
skb_queue_head_init(&ifsta->skb_queue);
@@ -2451,8 +2451,8 @@
msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
sdata->bss = &msdata->u.ap;
break;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-07-11 12:00:55.000000000 -0400
@@ -27,26 +27,412 @@
#include "aes_ccm.h"
#include "debugfs_key.h"
@@ -4309,8 +4309,8 @@
(iw_handler) ieee80211_ioctl_siwrts, /* SIOCSIWRTS */
(iw_handler) ieee80211_ioctl_giwrts, /* SIOCGIWRTS */
(iw_handler) ieee80211_ioctl_siwfrag, /* SIOCSIWFRAG */
---- linux-2.6.22.noarch/net/mac80211/debugfs_sta.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_sta.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/debugfs_sta.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_sta.c 2007-07-11 12:00:55.000000000 -0400
@@ -87,7 +87,7 @@ static ssize_t sta_flags_read(struct fil
{
char buf[100];
@@ -4337,8 +4337,8 @@
p += scnprintf(p, sizeof(buf)+buf-p, "\n");
return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
}
---- linux-2.6.22.noarch/net/mac80211/Makefile.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/Makefile.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -1,4 +1,4 @@
-obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o
+obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o rc80211_lowest.o
@@ -4353,8 +4353,8 @@
tkip.o \
aes_ccm.o \
wme.o \
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/net/mac80211/regdomain.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/net/mac80211/regdomain.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -4513,8 +4513,8 @@
+ channel_range = ieee80211_mkk_channels;
+}
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_lowest.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_lowest.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -4621,8 +4621,8 @@
+
+MODULE_DESCRIPTION("Forced 1 mbps rate control module for mac80211");
+MODULE_LICENSE("GPL");
---- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h 2007-07-11 12:00:55.000000000 -0400
@@ -25,6 +25,12 @@
* This table is no longer added to, the whole sub-ioctl
* mess shall be deleted completely. */
@@ -4892,8 +4892,8 @@
enum {
IEEE80211_KEY_MGMT_NONE = 0,
IEEE80211_KEY_MGMT_IEEE8021X = 1,
---- linux-2.6.22.noarch/net/mac80211/debugfs.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/debugfs.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs.c 2007-07-11 12:00:55.000000000 -0400
@@ -13,6 +13,16 @@
#include "ieee80211_rate.h"
#include "debugfs.h"
@@ -5009,8 +5009,8 @@
DEBUGFS_DEL(modes);
DEBUGFS_STATS_DEL(transmitted_fragment_count);
---- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c 2007-07-11 12:00:55.000000000 -0400
@@ -1557,11 +1557,18 @@ static int ieee80211_subif_start_xmit(st
memcpy(hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);
hdrlen = 30;
@@ -5217,8 +5217,8 @@
return 0;
}
---- linux-2.6.22.noarch/net/mac80211/wme.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wme.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/wme.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c 2007-07-11 12:00:55.000000000 -0400
@@ -29,12 +29,18 @@ ieee80211_rx_h_parse_qos(struct ieee8021
{
u8 *data = rx->skb->data;
@@ -5314,8 +5314,8 @@
return -1;
}
}
---- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c 2007-07-11 12:00:55.000000000 -0400
@@ -283,14 +283,16 @@ static void rate_control_simple_rate_ini
int i;
sta->txrate = 0;
@@ -5338,8 +5338,8 @@
}
}
---- linux-2.6.22.noarch/net/mac80211/Kconfig.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -64,6 +64,10 @@ config MAC80211_DEBUG_COUNTERS
bool "Extra statistics for TX/RX debugging"
depends on MAC80211_DEBUG
@@ -5351,8 +5351,8 @@
config MAC80211_IBSS_DEBUG
bool "Support for IBSS testing"
depends on MAC80211_DEBUG
---- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h 2007-07-11 12:00:55.000000000 -0400
@@ -59,6 +59,10 @@ struct ieee80211_local;
* increased memory use (about 2 kB of RAM per entry). */
#define IEEE80211_FRAGMENT_MAX 4
@@ -5582,8 +5582,8 @@
/* for wiphy privid */
extern void *mac80211_wiphy_privid;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c 2007-07-11 12:00:55.000000000 -0400
@@ -13,7 +13,7 @@
#include "ieee80211_cfg.h"
@@ -5606,8 +5606,8 @@
case NL80211_IFTYPE_MONITOR:
itype = IEEE80211_IF_TYPE_MNTR;
break;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c 2007-07-11 12:00:55.000000000 -0400
@@ -59,6 +59,9 @@
#define ERP_INFO_USE_PROTECTION BIT(1)
@@ -6691,8 +6691,8 @@
static void ieee80211_sta_reset_auth(struct net_device *dev,
struct ieee80211_if_sta *ifsta)
{
---- linux-2.6.22.noarch/net/mac80211/sta_info.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/sta_info.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/sta_info.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/sta_info.h 2007-07-11 12:00:55.000000000 -0400
@@ -27,6 +27,7 @@
*/
#define WLAN_STA_SHORT_PREAMBLE BIT(7)
@@ -6722,8 +6722,8 @@
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
---- linux-2.6.22.noarch/net/mac80211/sta_info.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/sta_info.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/sta_info.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/sta_info.c 2007-07-11 12:00:55.000000000 -0400
@@ -33,7 +33,7 @@ static void sta_info_hash_add(struct iee
/* Caller must hold local->sta_lock */
@@ -6793,8 +6793,8 @@
list_del(&sta->list);
sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
if (sta->flags & WLAN_STA_PS) {
---- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c 2007-07-11 12:00:55.000000000 -0400
@@ -87,6 +87,267 @@ static const struct file_operations name
IEEE80211_IF_FMT_##format(name, field) \
__IEEE80211_IF_FILE(name)
@@ -7183,8 +7183,8 @@
if (state != NETDEV_CHANGENAME)
return 0;
---- linux-2.6.22.noarch/net/mac80211/wpa.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wpa.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/wpa.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wpa.c 2007-07-11 12:00:55.000000000 -0400
@@ -20,6 +20,10 @@
#include "tkip.h"
#include "aes_ccm.h"
@@ -7483,8 +7483,8 @@
for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
< 0)
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/net/wireless/nl80211.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/net/wireless/nl80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,24 @@
+#ifndef __NET_WIRELESS_NL80211_H
+#define __NET_WIRELESS_NL80211_H
@@ -7510,8 +7510,8 @@
+#endif /* CONFIG_NL80211 */
+
+#endif /* __NET_WIRELESS_NL80211_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/net/wireless/nl80211.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/net/wireless/nl80211.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,994 @@
+/*
+ * This is the new netlink-based wireless configuration interface.
@@ -8507,15 +8507,15 @@
+{
+ genl_unregister_family(&nl80211_fam);
+}
---- linux-2.6.22.noarch/net/wireless/Makefile.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/Makefile.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -2,3 +2,4 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
cfg80211-y += core.o sysfs.o
+cfg80211-$(CONFIG_NL80211) += nl80211.o
---- linux-2.6.22.noarch/net/wireless/core.h.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.h 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/core.h.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.h 2007-07-11 12:00:55.000000000 -0400
@@ -43,7 +43,39 @@ struct cfg80211_registered_device *wiphy
extern struct mutex cfg80211_drv_mutex;
extern struct list_head cfg80211_drv_list;
@@ -8556,8 +8556,8 @@
+ char *newname);
+
#endif /* __NET_WIRELESS_CORE_H */
---- linux-2.6.22.noarch/net/wireless/core.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/core.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c 2007-07-11 12:00:55.000000000 -0400
@@ -16,6 +16,7 @@
#include <net/genetlink.h>
#include <net/cfg80211.h>
@@ -8733,8 +8733,8 @@
unregister_netdevice_notifier(&cfg80211_netdev_notifier);
wiphy_sysfs_exit();
}
---- linux-2.6.22.noarch/net/wireless/Kconfig.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -1,6 +1,19 @@
config CFG80211
tristate "Improved wireless configuration API"
@@ -8766,8 +8766,8 @@
Say N (if you can) unless you know you need wireless
extensions for external modules.
---- linux-2.6.22.noarch/net/wireless/sysfs.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/sysfs.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/sysfs.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c 2007-07-11 12:00:55.000000000 -0400
@@ -39,9 +39,59 @@ static ssize_t _show_permaddr(struct dev
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
}
@@ -8828,8 +8828,8 @@
{}
};
---- linux-2.6.22.noarch/.mailmap.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/.mailmap 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/.mailmap.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/.mailmap 2007-07-11 12:00:55.000000000 -0400
@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
Jeff Garzik <jgarzik at pretzel.yyz.us>
Jens Axboe <axboe at suse.de>
@@ -8838,8 +8838,8 @@
John Stultz <johnstul at us.ibm.com>
Juha Yrjola <at solidboot.com>
Juha Yrjola <juha.yrjola at nokia.com>
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/ohci-ssb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/ohci-ssb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,254 @@
+/*
+ * Sonics Silicon Backplane
@@ -9095,8 +9095,8 @@
+ .suspend = ssb_ohci_suspend,
+ .resume = ssb_ohci_resume,
+};
---- linux-2.6.22.noarch/drivers/usb/host/Kconfig.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/usb/host/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -142,6 +142,19 @@ config USB_OHCI_HCD_PCI
Enables support for PCI-bus plug-in USB controller cards.
If unsure, say Y.
@@ -9117,8 +9117,8 @@
config USB_OHCI_BIG_ENDIAN_DESC
bool
depends on USB_OHCI_HCD
---- linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c 2007-07-11 12:00:55.000000000 -0400
@@ -920,11 +920,17 @@ MODULE_LICENSE ("GPL");
#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_sb_driver
#endif
@@ -9169,15 +9169,15 @@
#ifdef PCI_DRIVER
pci_unregister_driver(&PCI_DRIVER);
#endif
---- linux-2.6.22.noarch/drivers/Makefile.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/Makefile.orig 2007-07-11 12:00:29.000000000 -0400
++++ linux-2.6.22.noarch/drivers/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -82,3 +82,4 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc
obj-$(CONFIG_DMA_ENGINE) += dma/
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
+obj-$(CONFIG_SSB) += ssb/
---- linux-2.6.22.noarch/drivers/Kconfig.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -56,6 +56,8 @@ source "drivers/w1/Kconfig"
source "drivers/hwmon/Kconfig"
@@ -9187,8 +9187,8 @@
source "drivers/mfd/Kconfig"
source "drivers/media/Kconfig"
---- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -1,6 +1,7 @@
config ZD1211RW
tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"
@@ -9197,17 +9197,17 @@
select WIRELESS_EXT
select FW_LOADER
---help---
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-07-10 15:54:56.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-07-10 15:58:38.000000000 -0400
-@@ -44,3 +44,6 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig 2007-07-11 12:00:29.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile 2007-07-11 12:01:25.000000000 -0400
+@@ -47,3 +47,6 @@ obj-$(CONFIG_LIBERTAS_USB) += libert
- obj-$(CONFIG_USB_ZD1201) += zd1201.o
- obj-$(CONFIG_LIBERTAS_USB) += libertas/
+ rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o
+ obj-$(CONFIG_RTL8187) += rtl8187.o
+
+# Drivers using Devicescape IEEE 802.11 stack (net/mac80211)
+obj-y += mac80211/
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,688 @@
+
+/*
@@ -9897,15 +9897,15 @@
+
+module_init(p54p_init);
+module_exit(p54p_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,4 @@
+obj-$(CONFIG_P54_COMMON) += prism54common.o
+obj-$(CONFIG_P54_USB) += prism54usb.o
+obj-$(CONFIG_P54_PCI) += prism54pci.o
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,106 @@
+#ifndef PRISM54PCI_H
+#define PRISM54PCI_H
@@ -10013,8 +10013,8 @@
+
+#endif /* PRISM54USB_H */
+#endif /* PRISM54PCI_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,898 @@
+
+/*
@@ -10914,8 +10914,8 @@
+
+module_init(p54u_init);
+module_exit(p54u_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,79 @@
+#ifndef PRISM54_H
+#define PRISM54_H
@@ -10996,8 +10996,8 @@
+void p54_free_common(struct ieee80211_hw *dev);
+
+#endif /* PRISM54_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/net2280.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/net2280.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,452 @@
+#ifndef NET2280_H
+#define NET2280_H
@@ -11451,8 +11451,8 @@
+ __le32 addr;
+} __attribute__ ((packed));
+#endif /* NET2280_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,10 @@
+config P54_COMMON
+ tristate "Softmac Prism54 support"
@@ -11464,8 +11464,8 @@
+config P54_PCI
+ tristate "Prism54 PCI support"
+ depends on P54_COMMON && PCI
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,954 @@
+
+/*
@@ -12421,8 +12421,8 @@
+
+module_init(p54_init);
+module_exit(p54_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,329 @@
+#ifndef PRISM54COMMON_H
+#define PRISM54COMMON_H
@@ -12753,8 +12753,8 @@
+};
+
+#endif /* PRISM54COMMON_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,133 @@
+#ifndef PRISM54USB_H
+#define PRISM54USB_H
@@ -12889,8 +12889,8 @@
+};
+
+#endif /* PRISM54USB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1684 @@
+/* zd_chip.c
+ *
@@ -14576,8 +14576,8 @@
+ ioreqs[0].value, ioreqs[1].value);
+ return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,11 @@
+obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o
+
@@ -14590,8 +14590,8 @@
+EXTRA_CFLAGS += -DDEBUG
+endif
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,57 @@
+/* zd_def.h
+ *
@@ -14650,8 +14650,8 @@
+#endif
+
+#endif /* _ZD_DEF_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,108 @@
+/* zd_rf.h
+ *
@@ -14761,8 +14761,8 @@
+int zd_rf_init_uw2453(struct zd_rf *rf);
+
+#endif /* _ZD_RF_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,913 @@
+/* zd_chip.h
+ *
@@ -15677,8 +15677,8 @@
+ struct zd_mc_hash *hash);
+
+#endif /* _ZD_CHIP_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,437 @@
+/* zd_rf_al2230.c: Functions for the AL2230 RF controller
+ *
@@ -16117,8 +16117,8 @@
+ rf->patch_cck_gain = 1;
+ return 0;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,29 @@
+/* zd_util.h
+ *
@@ -16149,8 +16149,8 @@
+#endif /* DEBUG */
+
+#endif /* _ZD_UTIL_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,82 @@
+/* zd_util.c
+ *
@@ -16234,8 +16234,8 @@
+ return NULL;
+ return (u8 *)buffer + (buffer_size - tail_size);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,279 @@
+/* zd_rf_rfmd.c: Functions for the RFMD RF controller
+ *
@@ -16516,8 +16516,8 @@
+ rf->switch_radio_off = rf2959_switch_radio_off;
+ return 0;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,67 @@
+#ifndef _ZD_IEEE80211_H
+#define _ZD_IEEE80211_H
@@ -16586,8 +16586,8 @@
+};
+
+#endif /* _ZD_IEEE80211_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,19 @@
+config ZD1211RW_MAC80211
+ tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)"
@@ -16608,8 +16608,8 @@
+ messages being saved to your kernel logs, which may help debug any
+ problems.
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,267 @@
+/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
+ *
@@ -16878,8 +16878,8 @@
+extern struct workqueue_struct *zd_workqueue;
+
+#endif /* _ZD_USB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,177 @@
+/* zd_rf.c
+ *
@@ -17058,8 +17058,8 @@
+ return zd_chip_generic_patch_6m_band(zd_rf_to_chip(rf), channel);
+}
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_uw2453.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_uw2453.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,534 @@
+/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
+ *
@@ -17595,8 +17595,8 @@
+ return 0;
+}
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,199 @@
+/* zd_mac.h
+ *
@@ -17797,8 +17797,8 @@
+#endif /* DEBUG */
+
+#endif /* _ZD_MAC_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,492 @@
+/* zd_rf_al7230b.c: Functions for the AL7230B RF controller
+ *
@@ -18292,8 +18292,8 @@
+
+ return 0;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1445 @@
+/* zd_usb.c
+ *
@@ -19740,8 +19740,8 @@
+ kfree(req);
+ return r;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,942 @@
+/* zd_mac.c
+ *
@@ -20685,8 +20685,8 @@
+ &mac->housekeeping.link_led_work);
+ zd_chip_control_leds(&mac->chip, LED_OFF);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,6 @@
+obj-$(CONFIG_BCM43XX_MAC80211) += bcm43xx/
+obj-$(CONFIG_RT2X00) += rt2x00/
@@ -20694,8 +20694,8 @@
+obj-$(CONFIG_P54_COMMON) += p54/
+obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/
+obj-$(CONFIG_IWLWIFI) += iwlwifi/
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,6 @@
+source "drivers/net/wireless/mac80211/bcm43xx/Kconfig"
+source "drivers/net/wireless/mac80211/rt2x00/Kconfig"
@@ -20703,8 +20703,8 @@
+source "drivers/net/wireless/mac80211/p54/Kconfig"
+source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
+source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,620 @@
+#ifndef ADM8211_H
+#define ADM8211_H
@@ -21326,12 +21326,12 @@
+};
+
+#endif /* ADM8211_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1 @@
+obj-$(CONFIG_ADM8211) += adm8211.o
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,25 @@
+config ADM8211
+ tristate "ADMtek ADM8211 support"
@@ -21358,8 +21358,8 @@
+ the Ralink RT2400 (SMC2635W) without a model number change.
+
+ Thanks to Infineon-ADMtek for their support of this driver.
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,2165 @@
+
+/*
@@ -23526,8 +23526,8 @@
+
+module_init(adm8211_init);
+module_exit(adm8211_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,28 @@
+#ifndef BCM43xx_TABLES_H_
+#define BCM43xx_TABLES_H_
@@ -23557,8 +23557,8 @@
+extern const u16 bcm43xx_tab_sigmasqr2[];
+
+#endif /* BCM43xx_TABLES_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,18 @@
+obj-$(CONFIG_BCM43XX_MAC80211) += bcm43xx-mac80211.o
+
@@ -23578,8 +23578,8 @@
+ bcm43xx_xmit.o \
+ bcm43xx_lo.o \
+ $(bcm43xx-mac80211-obj-y)
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1508 @@
+/*
+
@@ -25089,8 +25089,8 @@
+ bcm43xx_dma_tx_resume_ring(dev->dma.tx_ring0);
+ bcm43xx_power_saving_ctl_bits(dev, -1, -1);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef BCM43xx_SYSFS_H_
+#define BCM43xx_SYSFS_H_
@@ -25101,8 +25101,8 @@
+void bcm43xx_sysfs_unregister(struct bcm43xx_wldev *dev);
+
+#endif /* BCM43xx_SYSFS_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,310 @@
+#ifndef BCM43xx_PHY_H_
+#define BCM43xx_PHY_H_
@@ -25414,8 +25414,8 @@
+ u8 tx_control);
+
+#endif /* BCM43xx_PHY_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,88 @@
+#ifndef BCM43xx_LO_H_
+#define BCM43xx_LO_H_
@@ -25505,8 +25505,8 @@
+ const struct bcm43xx_bbatt *bbatt);
+
+#endif /* BCM43xx_LO_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,651 @@
+/*
+
@@ -26159,8 +26159,8 @@
+
+ /*TODO: We might need some stack support here to get the values. */
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,22 @@
+#ifndef BCM43xx_PCMCIA_H_
+#define BCM43xx_PCMCIA_H_
@@ -26184,8 +26184,8 @@
+
+#endif /* CONFIG_BCM43XX_MAC80211_PCMCIA */
+#endif /* BCM43xx_PCMCIA_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,4028 @@
+/*
+
@@ -30215,8 +30215,8 @@
+
+module_init(bcm43xx_init)
+module_exit(bcm43xx_exit)
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,158 @@
+/*
+
@@ -30376,8 +30376,8 @@
+{
+ pcmcia_unregister_driver(&bcm43xx_pcmcia_driver);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,4365 @@
+/*
+
@@ -34744,8 +34744,8 @@
+ phy->radio_on = 0;
+ dprintk(KERN_INFO PFX "Radio turned off\n");
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,82 @@
+/*
+
@@ -34829,8 +34829,8 @@
+ }
+ }
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,613 @@
+/*
+
@@ -35445,8 +35445,8 @@
+ }
+ printk("\n");
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,376 @@
+/*
+
@@ -35824,8 +35824,8 @@
+ bcm43xx_phy_write(dev, BCM43xx_PHY_GTABCTL, table + offset);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_GTABDATA, value);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,232 @@
+/*
+
@@ -36059,8 +36059,8 @@
+ device_remove_file(dev, &dev_attr_shortpreamble);
+ device_remove_file(dev, &dev_attr_interference);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,300 @@
+/*
+
@@ -36362,8 +36362,8 @@
+ bcm43xx_write16(dev, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
+ spin_unlock_irqrestore(&dev->wl->leds_lock, flags);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,365 @@
+#ifndef BCM43xx_DMA_H_
+#define BCM43xx_DMA_H_
@@ -36730,8 +36730,8 @@
+
+#endif /* CONFIG_BCM43XX_MAC80211_DMA */
+#endif /* BCM43xx_DMA_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,101 @@
+config BCM43XX_MAC80211
+ tristate "Broadcom BCM43xx wireless support (mac80211 stack)"
@@ -36834,8 +36834,8 @@
+ Only use PIO, if DMA does not work for you.
+
+endchoice
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,267 @@
+#ifndef BCM43xx_XMIT_H_
+#define BCM43xx_XMIT_H_
@@ -37104,8 +37104,8 @@
+}
+
+#endif /* BCM43xx_XMIT_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,41 @@
+/*
+
@@ -37148,8 +37148,8 @@
+ int bit25, int bit26);
+
+#endif /* BCM43xx_POWER_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,170 @@
+#ifndef BCM43xx_PIO_H_
+#define BCM43xx_PIO_H_
@@ -37321,8 +37321,8 @@
+
+#endif /* CONFIG_BCM43XX_MAC80211_PIO */
+#endif /* BCM43xx_PIO_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,56 @@
+#ifndef BCM43xx_LEDS_H_
+#define BCM43xx_LEDS_H_
@@ -37380,8 +37380,8 @@
+void bcm43xx_leds_switch_all(struct bcm43xx_wldev *dev, int on);
+
+#endif /* BCM43xx_LEDS_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,156 @@
+/*
+
@@ -37539,8 +37539,8 @@
+void bcm43xx_controller_restart(struct bcm43xx_wldev *dev, const char *reason);
+
+#endif /* BCM43xx_MAIN_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1112 @@
+/*
+
@@ -38654,8 +38654,8 @@
+{
+ bcm43xx_lo_g_ctl_current(dev)->used = 1;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,886 @@
+#ifndef BCM43xx_H_
+#define BCM43xx_H_
@@ -39543,8 +39543,8 @@
+#define Q52_ARG(q52) ((q52) / 4), ((((q52) & 3) * 100) / 4)
+
+#endif /* BCM43xx_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,671 @@
+/*
+
@@ -40217,8 +40217,8 @@
+ if (!list_empty(&pio->queue3->txqueue))
+ tasklet_schedule(&pio->queue3->txtask);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,133 @@
+#ifndef BCM43xx_DEBUGFS_H_
+#define BCM43xx_DEBUGFS_H_
@@ -40353,8 +40353,8 @@
+ } while (0)
+
+#endif /* BCM43xx_DEBUGFS_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,161 @@
+/******************************************************************************
+ *
@@ -40517,8 +40517,8 @@
+ const struct iwl_priv *priv, int phymode, int channel);
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,29 @@
+# NOTE: We use common code from base.c to build driver
+# specific binaries based on the #define IWL -- the target
@@ -40549,8 +40549,8 @@
+ $(call cmd,force_checksrc)
+ $(call if_changed_rule,cc_o_c)
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-eeprom.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-eeprom.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,335 @@
+/******************************************************************************
+ *
@@ -40887,8 +40887,8 @@
+#define IWL_EEPROM_IMAGE_SIZE 1024
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,2013 @@
+/******************************************************************************
+ *
@@ -42903,8 +42903,8 @@
+ ieee80211_rate_control_unregister(&rs_ops);
+}
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-commands.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-commands.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,701 @@
+/******************************************************************************
+ *
@@ -43607,8 +43607,8 @@
+} __attribute__ ((packed));
+
+#endif /* __iwl_commands_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,221 @@
+/******************************************************************************
+ *
@@ -43831,8 +43831,8 @@
+#endif /* IWL == 3945 */
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,2445 @@
+/******************************************************************************
+ *
@@ -46279,8 +46279,8 @@
+};
+
+MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,4379 @@
+/******************************************************************************
+ *
@@ -50661,8 +50661,8 @@
+};
+
+MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,285 @@
+/******************************************************************************
+ *
@@ -50949,8 +50949,8 @@
+#endif /* IWL == 4965 */
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,96 @@
+config IWLWIFI
+ bool "Intel Wireless WiFi Link Drivers"
@@ -51048,8 +51048,8 @@
+ inserted in and remvoed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called iwl3945.ko.
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,8375 @@
+/******************************************************************************
+ *
@@ -59426,8 +59426,8 @@
+
+module_exit(iwl_exit);
+module_init(iwl_init);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-io.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-io.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,474 @@
+/******************************************************************************
+ *
@@ -59903,8 +59903,8 @@
+}
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-hw.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-hw.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,979 @@
+/******************************************************************************
+ *
@@ -60885,8 +60885,8 @@
+} __attribute__ ((packed));
+
+#endif /* __iwl_4965_hw_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-hw.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-hw.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1507 @@
+/******************************************************************************
+ *
@@ -62395,8 +62395,8 @@
+#endif
+
+#endif /* __iwlwifi_hw_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-spectrum.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-spectrum.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,91 @@
+/******************************************************************************
+ *
@@ -62489,8 +62489,8 @@
+ } u;
+} __attribute__ ((packed));
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,303 @@
+/******************************************************************************
+ *
@@ -62795,8 +62795,8 @@
+}; /*iwl_priv */
+
+#endif /* __iwl_priv_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,247 @@
+/******************************************************************************
+ *
@@ -63045,8 +63045,8 @@
+
+#endif /* IWL == 4965 */
+#endif /* __iwl_4965_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,658 @@
+/******************************************************************************
+ *
@@ -63706,8 +63706,8 @@
+
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
@@ -63761,8 +63761,8 @@
+#endif /* IWL == 3945 */
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,140 @@
+/******************************************************************************
+ *
@@ -63904,8 +63904,8 @@
+#define IWL_DEBUG_11H(f, a...) IWL_DEBUG(IWL_DL_11H, f, ## a)
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-hw.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-hw.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,90 @@
+/******************************************************************************
+ *
@@ -63997,8 +63997,8 @@
+} __attribute__ ((packed));
+
+#endif
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,363 @@
+/******************************************************************************
+ *
@@ -64363,8 +64363,8 @@
+#endif
+
+#endif /* __iwl_helpers_h__ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,969 @@
+/******************************************************************************
+ *
@@ -65335,8 +65335,8 @@
+}
+
+
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1087 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -66425,8 +66425,8 @@
+}
+
+#endif /* RT2X00_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,515 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -66943,8 +66943,8 @@
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("rt2x00 library");
+MODULE_LICENSE("GPL");
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,947 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -67893,8 +67893,8 @@
+static void rt73usb_interrupt_rxdone(struct urb *urb);
+
+#endif /* RT73USB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1078 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -68974,8 +68974,8 @@
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("rt2x00 library");
+MODULE_LICENSE("GPL");
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1701 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -70678,8 +70678,8 @@
+
+module_init(rt2400pci_init);
+module_exit(rt2400pci_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,60 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -70741,8 +70741,8 @@
+ const int antenna_tx, const int antenna_rx);
+
+#endif /* RT2X00DEV_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,22 @@
+rt2x00lib-objs := rt2x00dev.o rt2x00mac.o
+
@@ -70766,8 +70766,8 @@
+obj-$(CONFIG_RT61PCI) += rt61pci.o
+obj-$(CONFIG_RT2500USB) += rt2500usb.o
+obj-$(CONFIG_RT73USB) += rt73usb.o
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1687 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72456,8 +72456,8 @@
+
+module_init(rt2500usb_init);
+module_exit(rt2500usb_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,118 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72577,8 +72577,8 @@
+ const struct ieee80211_tx_queue_params *params);
+
+#endif /* RT2X00LIB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72631,8 +72631,8 @@
+#endif /* CONFIG_RT2X00_LIB_RFKILL */
+
+#endif /* RT2X00RFKILL_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,132 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72766,8 +72766,8 @@
+#endif /* CONFIG_PM */
+
+#endif /* RT2X00USB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,360 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -73129,8 +73129,8 @@
+
+ rt2x00dev->debugfs_intf = NULL;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,429 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -73561,8 +73561,8 @@
+ return 0;
+}
+EXPORT_SYMBOL_GPL(rt2x00lib_conf_tx);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,66 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -73630,8 +73630,8 @@
+#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
+
+#endif /* RT2X00DEBUG_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1358 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74991,8 +74991,8 @@
+})
+
+#endif /* RT61PCI_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,933 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -75927,8 +75927,8 @@
+})
+
+#endif /* RT2400PCI_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,737 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -76667,8 +76667,8 @@
+static void rt2500usb_interrupt_rxdone(struct urb *urb);
+
+#endif /* RT2500USB_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1202 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -77872,8 +77872,8 @@
+})
+
+#endif /* RT2500PCI_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,129 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -78004,8 +78004,8 @@
+
+ rfkill_free(rt2x00dev->rfkill);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,49 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -78056,8 +78056,8 @@
+#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
+
+#endif /* RT2X00FIRMWARE_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,130 @@
+config RT2X00
+ tristate "Ralink driver support"
@@ -78189,8 +78189,8 @@
+ depends on RT2X00 && RT2X00_LIB
+ ---help---
+ Enable debugging output for all rt2x00 modules
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,125 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -78317,8 +78317,8 @@
+ ERROR(rt2x00dev, "Firmware loading timed out.\n");
+ return -ETIMEDOUT;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1914 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -80234,8 +80234,8 @@
+
+module_init(rt2500pci_init);
+module_exit(rt2500pci_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,2331 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -82568,8 +82568,8 @@
+
+module_init(rt61pci_init);
+module_exit(rt61pci_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,407 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -82978,8 +82978,8 @@
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION("rt2x00 library");
+MODULE_LICENSE("GPL");
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,112 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -83093,8 +83093,8 @@
+#endif /* CONFIG_PM */
+
+#endif /* RT2X00PCI_H */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1903 @@
+/*
+ Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84999,22 +84999,22 @@
+
+module_init(rt73usb_init);
+module_exit(rt73usb_exit);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,2 @@
+This directory contains IEEE 802.11 wireless LAN drivers that are using
+Devicescape IEEE 802.11 stack (net/mac80211).
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-07-10 15:54:57.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-07-10 15:56:02.000000000 -0400
-@@ -550,4 +550,6 @@ source "drivers/net/wireless/hostap/Kcon
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-07-11 12:00:29.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-07-11 12:00:55.000000000 -0400
+@@ -562,4 +562,6 @@ source "drivers/net/wireless/hostap/Kcon
source "drivers/net/wireless/bcm43xx/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/mac80211/Kconfig"
+
endmenu
---- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-07-10 15:54:57.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -1,6 +1,7 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
@@ -85023,8 +85023,8 @@
select WIRELESS_EXT
select FW_LOADER
select HW_RANDOM
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,11 @@
+ssb-builtin-drivers-y += driver_chipcommon.o
+ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
@@ -85037,8 +85037,8 @@
+
+ssb-objs := main.o scan.o \
+ $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,263 @@
+/*
+ * Sonics Silicon Backplane
@@ -85303,8 +85303,8 @@
+error:
+ return -ENODEV;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,1061 @@
+/*
+ * Sonics Silicon Backplane
@@ -86367,8 +86367,8 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -86474,8 +86474,8 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,258 @@
+/*
+ * Sonics Silicon Backplane
@@ -86735,8 +86735,8 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,137 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -86875,8 +86875,8 @@
+#endif /* CONFIG_SSB_PCIHOST */
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,688 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -87566,8 +87566,8 @@
+out:
+ return err;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,402 @@
+/*
+ * Sonics Silicon Backplane
@@ -87971,8 +87971,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,93 @@
+menu "Sonics Silicon Backplane"
+
@@ -88067,8 +88067,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,407 @@
+/*
+ * Sonics Silicon Backplane
@@ -88477,8 +88477,8 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-07-10 08:31:05.354624318 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-10 15:56:02.000000000 -0400
+--- /dev/null 2007-07-11 10:53:53.353955061 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-07-11 12:00:55.000000000 -0400
@@ -0,0 +1,556 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3296
retrieving revision 1.3297
diff -u -r1.3296 -r1.3297
--- kernel-2.6.spec 11 Jul 2007 15:36:42 -0000 1.3296
+++ kernel-2.6.spec 11 Jul 2007 18:12:44 -0000 1.3297
@@ -575,7 +575,7 @@
Patch661: linux-2.6-libata-ich8m-add-pciid.patch
Patch670: linux-2.6-ata-quirk.patch
Patch680: git-wireless-dev.patch
-Patch681: linux-2.6-rtl8187.patch
+Patch681: git-iwlwifi.patch
Patch690: linux-2.6-e1000-ich9.patch
Patch691: linux-2.6-sky2-restore-workarounds.patch
Patch710: linux-2.6-bcm43xx-pci-neuter.patch
@@ -1206,9 +1206,9 @@
ApplyPatch linux-2.6-ata-quirk.patch
# Add the wireless stack updates and drivers from wireless-dev
-#ApplyPatch git-wireless-dev.patch
-# Add the rtl8187 driver from upstream
-#ApplyPatch linux-2.6-rtl8187.patch
+ApplyPatch git-wireless-dev.patch
+# Add iwlwifi from intellinuxwireless.org
+ApplyPatch git-iwlwifi.patch
# add patch from markmc so that e1000 supports ICH9
ApplyPatch linux-2.6-e1000-ich9.patch
# sky2: restore workarounds for lost interrupts
@@ -2147,6 +2147,10 @@
%endif
%changelog
+* Wed Jul 11 2007 John W. Linville <linville at redhat.com>
+- Reinstate git-wireless-dev.patch
+- Add updated iwlwifi driver from intellinuxwireless.org
+
* Tue Jul 10 2007 Dave Jones <davej at redhat.com>
- Fix issue with PIE randomization (#246623).
--- linux-2.6-rtl8187.patch DELETED ---
More information about the scm-commits
mailing list