rpms/kernel/devel git-iwlwifi-fixes.patch, 1.4, 1.5 git-iwlwifi.patch, 1.3, 1.4 kernel-2.6.spec, 1.3116, 1.3117
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 27 19:16:59 UTC 2007
- Previous message (by thread): rpms/openoffice.org/FC-6 openoffice.org.spec, 1.943, 1.944 openoffice.org-2.0.4.ooo69010.sd.undocrash.patch, 1.1, NONE
- Next message (by thread): rpms/system-config-kickstart/devel .cvsignore, 1.43, 1.44 sources, 1.51, 1.52 system-config-kickstart.spec, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1560
Modified Files:
git-iwlwifi-fixes.patch git-iwlwifi.patch kernel-2.6.spec
Log Message:
update iwlwifi (0.0.14+)
git-iwlwifi-fixes.patch:
base.c | 2 +-
iwlwifi.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-iwlwifi-fixes.patch 25 Apr 2007 19:42:10 -0000 1.4
+++ git-iwlwifi-fixes.patch 27 Apr 2007 19:16:57 -0000 1.5
@@ -1,55 +1,6 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-25 15:18:59.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-25 15:27:43.000000000 -0400
-@@ -7599,7 +7599,6 @@ static void ipw_handle_data_packet(struc
- short len = le16_to_cpu(rx_hdr->len);
-
- /* We received data from the HW, so stop the watchdog */
-- ieee80211_netif_oper(priv->ieee, NETIF_UPDATE_TX_START);
- if (unlikely((len + IPW_RX_FRAME_SIZE) > skb_tailroom(rxb->skb))) {
- priv->wstats.discard.misc++;
- IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
-@@ -8238,10 +8237,6 @@ static int ipw_queue_tx_reclaim(struct i
- is_next = 1;
- }
- done:
-- if (ipw_queue_space(q) > q->low_mark && (fifo >= 0)
-- && (fifo != priv->hw_setting.cmd_queue_no)
-- && priv->netdev_registered && netif_running(priv->net_dev))
-- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
- used = q->first_empty - q->last_used;
- if (used < 0)
- used += q->n_window;
-@@ -9185,13 +9180,9 @@ static int d_open(struct ieee80211_hw *h
- /* we should be verifying the device is ready to be opened */
- mutex_lock(&priv->mutex);
-
-- if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK)) {
-- ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
-- ieee80211_netif_oper(priv->ieee, NETIF_START);
-- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
-+ if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK))
- netif_carrier_on(priv->net_dev);
-
-- }
- mutex_unlock(&priv->mutex);
- IPW_DEBUG_MAC80211("leave %p\n", hw);
- return 0;
-@@ -9974,14 +9965,6 @@ static void ipw_link_up(struct ipw_priv
- priv->last_frag_num = -1;
- priv->last_packet_time = 0;
-
-- if (ieee80211_netif_oper(priv->ieee, NETIF_IS_STOPPED)) {
-- IPW_DEBUG_NOTIF("waking queue\n");
-- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
-- } else {
-- IPW_DEBUG_NOTIF("starting queue\n");
-- ieee80211_netif_oper(priv->ieee, NETIF_START);
-- }
--
- ipw_scan_cancel(priv);
- ipw_reset_stats(priv);
-
-@@ -10247,7 +10230,7 @@ static int ipw_update_power_cmd(struct i
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-27 14:33:42.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-27 14:37:01.000000000 -0400
+@@ -9951,7 +9951,7 @@ static int ipw_update_power_cmd(struct i
u8 period = 0;
struct ipw_power_mgr *pow_data;
@@ -58,38 +9,8 @@
IPW_DEBUG_POWER("Error invalid power mode \n");
return -1;
}
-@@ -12970,6 +12953,7 @@ static int ipw_pci_probe(struct pci_dev
- err = ipw_read_ucode(priv);
- if (err) {
- IPW_ERROR("Could not read microcode from disk: %d\n", err);
-+ mutex_unlock(&priv->mutex);
- goto out_remove_sysfs;
- }
-
-@@ -13154,9 +13138,6 @@ static int ipw_pci_suspend(struct pci_de
- /* Take down the device; powers it off, etc. */
- ipw_down(priv);
-
-- /* Remove the PRESENT state of the device */
-- if (priv->netdev_registered)
-- ieee80211_netif_oper(priv->ieee, NETIF_DETACH);
- pci_save_state(pdev);
- pci_disable_device(pdev);
- pci_set_power_state(pdev, PCI_D3hot);
-@@ -13186,11 +13167,6 @@ static int ipw_pci_resume(struct pci_dev
- */
- pci_write_config_byte(pdev, 0x41, 0x00);
-
-- /* Set the device back into the PRESENT state; this will also wake
-- * the queue of needed */
-- if (priv->netdev_registered)
-- ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
--
- queue_delayed_work(priv->workqueue, &priv->resume_work, 3 * HZ);
-
- mutex_unlock(&priv->mutex);
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-25 15:18:59.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-25 15:19:11.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-27 14:33:42.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-27 14:37:01.000000000 -0400
@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
#define IPW_DL_QOS (1<<31)
git-iwlwifi.patch:
Kconfig | 1
Makefile | 1
iwlwifi/Kconfig | 52
iwlwifi/Makefile | 2
iwlwifi/base.c |12363 ++++++++++++++++++++++++++++++++++++++++++++++++++
iwlwifi/iwl-3945-rs.c | 962 +++
iwlwifi/iwl-3945-rs.h | 89
iwlwifi/iwlwifi.h | 1296 +++++
iwlwifi/iwlwifi_hw.h | 1973 +++++++
9 files changed, 16739 insertions(+)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 git-iwlwifi.patch
Index: git-iwlwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-iwlwifi.patch 13 Apr 2007 20:44:49 -0000 1.3
+++ git-iwlwifi.patch 27 Apr 2007 19:16:57 -0000 1.4
@@ -1,10 +1,10 @@
-http://www.intellinuxwireless.org/repos/iwlwifi.git
+rsync://www.intellinuxwireless.org/repos/iwlwifi.git
-commit 54fa65b1135566728167bbab1d2f20c739632e2d
+commit 440a9ee592a409e926f77633ce41ccad7be6c429
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-11 14:46:30.000000000 -0400
-@@ -0,0 +1,13762 @@
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-27 14:33:42.000000000 -0400
+@@ -0,0 +1,12363 @@
+/******************************************************************************
+
+ Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
@@ -113,7 +113,7 @@
+
+#include "iwlwifi.h"
+
-+#define IWLWIFI_VERSION "0.0.12k"
++#define IWLWIFI_VERSION "0.0.14k"
+
+#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
@@ -132,61 +132,13 @@
+#define IEEE80211_24GHZ_BAND (1<<0)
+#define IEEE80211_52GHZ_BAND (1<<1)
+
-+#define IEEE80211_CCK_RATE_1MB 0x02
-+#define IEEE80211_CCK_RATE_2MB 0x04
-+#define IEEE80211_CCK_RATE_5MB 0x0B
-+#define IEEE80211_CCK_RATE_11MB 0x16
-+#define IEEE80211_OFDM_RATE_6MB 0x0C
-+#define IEEE80211_OFDM_RATE_9MB 0x12
-+#define IEEE80211_OFDM_RATE_12MB 0x18
-+#define IEEE80211_OFDM_RATE_18MB 0x24
-+#define IEEE80211_OFDM_RATE_24MB 0x30
-+#define IEEE80211_OFDM_RATE_36MB 0x48
-+#define IEEE80211_OFDM_RATE_48MB 0x60
-+#define IEEE80211_OFDM_RATE_54MB 0x6C
-+#define IEEE80211_BASIC_RATE_MASK 0x80
-+
-+#define IEEE80211_CCK_RATE_1MB_MASK (1<<0)
-+#define IEEE80211_CCK_RATE_2MB_MASK (1<<1)
-+#define IEEE80211_CCK_RATE_5MB_MASK (1<<2)
-+#define IEEE80211_CCK_RATE_11MB_MASK (1<<3)
-+#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4)
-+#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5)
-+#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6)
-+#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7)
-+#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8)
-+#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9)
-+#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10)
-+#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11)
-+
-+#define IEEE80211_CCK_RATES_MASK 0x0000000F
-+#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \
-+ IEEE80211_CCK_RATE_2MB_MASK)
-+#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \
-+ IEEE80211_CCK_RATE_5MB_MASK | \
-+ IEEE80211_CCK_RATE_11MB_MASK)
-+
-+#define IEEE80211_OFDM_RATES_MASK 0x00000FF0
-+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
-+ IEEE80211_OFDM_RATE_12MB_MASK | \
-+ IEEE80211_OFDM_RATE_24MB_MASK)
-+#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \
-+ IEEE80211_OFDM_RATE_9MB_MASK | \
-+ IEEE80211_OFDM_RATE_18MB_MASK | \
-+ IEEE80211_OFDM_RATE_36MB_MASK | \
-+ IEEE80211_OFDM_RATE_48MB_MASK | \
-+ IEEE80211_OFDM_RATE_54MB_MASK)
-+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
-+ IEEE80211_CCK_DEFAULT_RATES_MASK)
-+
-+#define IEEE80211_NUM_OFDM_RATES 8
-+#define IEEE80211_NUM_CCK_RATES 4
+#define IEEE80211_OFDM_SHIFT_MASK_A 4
+
+/*MAC80211 end */
+
+static u32 ipw_debug_level;
+
++static int param_disable_hw_scan = 0;
+static int param_debug = 0;
+static int param_channel = 0;
+static int param_mode = 0;
@@ -208,8 +160,6 @@
+
+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, struct ipw_host_cmd *cmd);
+
-+static int ipw_init_rate_scaling(struct ipw_priv *priv);
-+
+static int ipw_rate_scale_rxon_handle(struct ipw_priv *priv, s32 sta_id);
+static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid);
+static void ipw_clear_stations_table(struct ipw_priv *priv);
@@ -1603,6 +1553,271 @@
+static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO,
+ show_tx_power, store_tx_power);
+
++#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT
++
++/*******************************************************/
++
++enum { /* ieee80211_basic_report.map */
++ IEEE80211_BASIC_MAP_BSS = (1 << 0),
++ IEEE80211_BASIC_MAP_OFDM = (1 << 1),
++ IEEE80211_BASIC_MAP_UNIDENTIFIED = (1 << 2),
++ IEEE80211_BASIC_MAP_RADAR = (1 << 3),
++ IEEE80211_BASIC_MAP_UNMEASURED = (1 << 4),
++ /* Bits 5-7 are reserved */
++
++};
++struct ieee80211_basic_report {
++ u8 channel;
++ __le64 start_time;
++ __le16 duration;
++ u8 map;
++} __attribute__ ((packed));
++
++enum { /* ieee80211_measurement_request.mode */
++ /* Bit 0 is reserved */
++ IEEE80211_MEASUREMENT_ENABLE = (1 << 1),
++ IEEE80211_MEASUREMENT_REQUEST = (1 << 2),
++ IEEE80211_MEASUREMENT_REPORT = (1 << 3),
++ /* Bits 4-7 are reserved */
++};
++
++enum {
++ IEEE80211_REPORT_BASIC = 0, /* required */
++ IEEE80211_REPORT_CCA = 1, /* optional */
++ IEEE80211_REPORT_RPI = 2, /* optional */
++ /* 3-255 reserved */
++};
++
++struct ieee80211_measurement_params {
++ u8 channel;
++ __le64 start_time;
++ __le16 duration;
++} __attribute__ ((packed));
++
++struct ieee80211_info_element {
++ u8 id;
++ u8 len;
++ u8 data[0];
++} __attribute__ ((packed));
++
++struct ieee80211_measurement_request {
++ struct ieee80211_info_element ie;
++ u8 token;
++ u8 mode;
++ u8 type;
++ struct ieee80211_measurement_params params[0];
++} __attribute__ ((packed));
++
++struct ieee80211_measurement_report {
++ struct ieee80211_info_element ie;
++ u8 token;
++ u8 mode;
++ u8 type;
++ union {
++ struct ieee80211_basic_report basic[0];
++ } u;
++} __attribute__ ((packed));
++
++
++#define BEACON_TIME_MASK_LOW 0x00FFFFFF
++#define BEACON_TIME_MASK_HIGH 0xFF000000
++#define TIME_UNIT 1024
++
++/*
++ * extended beacon time format
++ * time in usec will be changed into a 32-bit value in 8:24 format
++ * the high 1 byte is the beacon counts
++ * the lower 3 bytes is the time in usec within one beacon interval
++ */
++
++static u32 ipw_usecs_to_beacons(u32 usec, u32 beacon_interval)
++{
++ u32 quot;
++ u32 rem;
++ u32 interval = beacon_interval * 1024;
++
++ if (!interval || !usec)
++ return 0;
++
++ quot = (usec / interval) % 0x100;
++ rem = (usec % interval) % BEACON_TIME_MASK_LOW;
++
++ return (quot << 24) + rem;
++}
[...12198 lines suppressed...]
-+ u32 probe_time;
-+} __attribute__ ((packed));
++ if (high != IPW_INVALID_RATE)
++ high_tpt = scale_priv->win[high].average_tpt;
+
-+struct statistics_general {
-+ u32 temperature;
-+ struct statistics_dbg dbg;
-+ u32 sleep_time;
-+ u32 slots_out;
-+ u32 slots_idle;
-+ u32 ttl_timestamp;
-+ struct statistics_div div;
-+} __attribute__ ((packed));
++ spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
+
-+struct ipw_notif_statistics {
-+ u32 flag;
-+ struct statistics_rx rx;
-+ struct statistics_tx tx;
-+ struct statistics_general general;
-+} __attribute__ ((packed));
++ scale_action = 1;
+
-+struct ipw_rx_packet {
-+ u32 len;
-+ struct ipw_cmd_header hdr;
-+ union {
-+ struct ipw_alive_resp alive_frame;
-+ struct ipw_rx_frame rx_frame;
-+ struct ipw_tx_resp tx_resp;
-+ struct ipw_spectrum_notification spectrum_notif;
-+ struct ipw_csa_notification csa_notif;
-+ struct ipw_error_resp err_resp;
-+ struct ipw_card_state_notif card_state_notif;
-+ struct ipw_notif_statistics stats;
-+ struct BeaconNtfSpecifics beacon_status;
-+ struct ipw_add_sta_resp add_sta;
-+ struct ipw_sleep_notification sleep_notif;
-+ u32 status;
-+ u8 raw[0];
-+ } u;
-+} __attribute__ ((packed));
++ if ((window->success_ratio < IPW_RATE_SCALE_DECREASE_TH) ||
++ !current_tpt) {
++ IPW_DEBUG_RATE("decrease rate because of low success_ratio\n");
++ scale_action = -1;
++ } else if ((low_tpt == IPW_INVALID_VALUE) &&
++ (high_tpt == IPW_INVALID_VALUE)) {
++ scale_action = 1;
++ } else if ((low_tpt != IPW_INVALID_VALUE) &&
++ (high_tpt != IPW_INVALID_VALUE)
++ && (low_tpt < current_tpt)
++ && (high_tpt < current_tpt)) {
++ IPW_DEBUG_RATE("No action -- low [%d] & high [%d] < "
++ "current_tpt [%d]\n",
++ low_tpt, high_tpt, current_tpt);
++ scale_action = 0;
++ } else {
++ if (high_tpt != IPW_INVALID_VALUE) {
++ if (high_tpt > current_tpt)
++ scale_action = 1;
++ else {
++ IPW_DEBUG_RATE
++ ("decrease rate because of high tpt\n");
++ scale_action = -1;
++ }
++ } else if (low_tpt != IPW_INVALID_VALUE) {
++ if (low_tpt > current_tpt) {
++ IPW_DEBUG_RATE
++ ("decrease rate because of low tpt\n");
++ scale_action = -1;
++ } else
++ scale_action = 1;
++ }
++ }
+
-+#define IPW_RX_FRAME_SIZE (4 + sizeof(struct ipw_rx_frame))
++ if ((window->success_ratio > IPW_RATE_SCALE_HIGH_TH) ||
++ (current_tpt > (128 * window->average_tpt))) {
++ IPW_DEBUG_RATE("No action -- success_ratio [%d] > HIGH_TH or "
++ "current_tpt [%d] > average_tpt [%d]\n",
++ window->success_ratio,
++ current_tpt, 128 * window->average_tpt);
++ scale_action = 0;
++ }
+
-+struct ipw_multicast_addr {
-+ u8 num_of_multicast_addresses;
-+ u8 reserved[3];
-+ u8 mac1[6];
-+ u8 mac2[6];
-+ u8 mac3[6];
-+ u8 mac4[6];
-+} __attribute__ ((packed));
++ switch (scale_action) {
++ case -1:
++ if (low != IPW_INVALID_RATE)
++ index = low;
++ break;
+
-+struct ipw_tgi_tx_key {
-+ u8 key_id;
-+ u8 security_type;
-+ u8 station_index;
-+ u8 flags;
-+ u8 key[16];
-+ u32 tx_counter[2];
-+} __attribute__ ((packed));
++ case 1:
++ if (high != IPW_INVALID_RATE)
++ index = high;
+
-+struct ipw_associate {
-+ u8 channel;
-+ u8 auth_type:4, auth_key:4;
-+ u8 assoc_type;
-+ u8 reserved;
-+ u16 policy_support;
-+ u8 preamble_length;
-+ u8 ieee_mode;
-+ u8 bssid[ETH_ALEN];
-+ u32 assoc_tsf_msw;
-+ u32 assoc_tsf_lsw;
-+ u16 capability;
-+ u16 listen_interval;
-+ u16 beacon_interval;
-+ u8 dest[ETH_ALEN];
-+ u16 atim_window;
-+ u8 smr;
-+ u8 reserved1;
-+ u16 reserved2;
-+ u16 assoc_id;
-+ u8 erp_value;
-+} __attribute__ ((packed));
++ break;
+
-+#define IPW_SUPPORTED_RATES_IE_LEN 8
++ case 0:
++ default:
++ break;
++ }
+
-+struct ipw_supported_rates {
-+ u8 ieee_mode;
-+ u8 num_rates;
-+ u8 purpose;
-+ u8 reserved;
-+ u8 supported_rates[IPW_MAX_RATES];
-+} __attribute__ ((packed));
++ IPW_DEBUG_RATE("Selected %d (action %d) - low %d high %d\n",
++ index, scale_action, low, high);
+
-+struct ipw_channel_tx_power {
-+ u8 channel_number;
-+ s8 tx_power;
-+} __attribute__ ((packed));
++ out:
++
++ sta->last_txrate = index;
++ sta->txrate = sta->last_txrate;
++ sta_info_put(sta);
+
++ IPW_DEBUG_RATE("leave: %d\n", index);
++ return &priv->ieee_rates[index];
++}
+
-+#define IPW_RX_BUF_SIZE 3000
+
-+#endif /* __iwlwifi_hw_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-11 14:46:00.000000000 -0400
++static char* rs_name = "iwlwifi rate-scale";
++static void ipw_set_rate_scale_handlers(struct ipw_priv *priv)
++{
++ priv->rate_control.module = NULL;
++ priv->rate_control.name = rs_name;
++ priv->rate_control.tx_status = &rs_tx_status;
++ priv->rate_control.get_rate = &rs_get_rate;
++ priv->rate_control.rate_init = rs_rate_init;
++ priv->rate_control.clear = rs_clear;
++ priv->rate_control.alloc = rs_alloc;
++ priv->rate_control.free = rs_free;
++ priv->rate_control.alloc_sta = rs_alloc_sta;
++ priv->rate_control.free_sta = rs_free_sta;
++}
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-27 14:33:25.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/
obj-$(CONFIG_P54_COMMON) += p54/
obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/
obj-$(CONFIG_RTL818X) += rtl818x/
+obj-$(CONFIG_IWLWIFI) += iwlwifi/
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-11 14:46:00.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-27 14:33:25.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
source "drivers/net/wireless/mac80211/p54/Kconfig"
source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3116
retrieving revision 1.3117
diff -u -r1.3116 -r1.3117
--- kernel-2.6.spec 26 Apr 2007 14:11:41 -0000 1.3116
+++ kernel-2.6.spec 27 Apr 2007 19:16:57 -0000 1.3117
@@ -2331,6 +2331,9 @@
# - tux.
%changelog
+* Fri Apr 27 2007 John W. Linville <linville at redhat.com>
+- Update git-iwlwifi.patch (and update git-iwlwifi-fixes.patch to match)
+
* Thu Apr 26 2007 Dave Jones <davej at redhat.com>
- 2.6.21
- Previous message (by thread): rpms/openoffice.org/FC-6 openoffice.org.spec, 1.943, 1.944 openoffice.org-2.0.4.ooo69010.sd.undocrash.patch, 1.1, NONE
- Next message (by thread): rpms/system-config-kickstart/devel .cvsignore, 1.43, 1.44 sources, 1.51, 1.52 system-config-kickstart.spec, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list