* [PATCH 0/3] [compat-2.6] Small fixes
@ 2009-11-20 22:01 Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 1/3] [compat-2.6] Add IFF_DONT_BRIDGE definition to compat Hauke Mehrtens
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2009-11-20 22:01 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Fix build of compat-wireless and refresh some files.
compat-wireless does not build with kernel 2.6.26 and older, because
debugfs_remove_recursive is missing. This is not fixed by this patch.
Hauke Mehrtens (3):
[compat-2.6] Add IFF_DONT_BRIDGE definition to compat
[compat-2.6] Refresh config.mk
[compat-2.6] Refresh patches
compat/compat-2.6.33.c | 16 +++++++++++++
compat/compat-2.6.33.h | 15 ++++++++++++
compat/compat.h | 1 +
compat/patches/01-netdev.patch | 24 ++++++++++----------
compat/patches/02-ksize.patch | 2 +-
compat/patches/03-rfkill.patch | 20 ++++++++--------
compat/patches/05-usb.patch | 2 +-
compat/patches/06-header-changes.patch | 2 +-
compat/patches/08-rename-iwl4965-config.patch | 2 +-
.../patches/10-add-wext-handlers-to-netdev.patch | 2 +-
compat/patches/13-trace.patch | 2 +-
compat/patches/14-device-type.patch | 2 +-
compat/patches/15-symbol-export-conflicts.patch | 2 +-
compat/patches/98-add-compat-wireless.patch | 3 +-
config.mk | 17 ++++++-------
15 files changed, 72 insertions(+), 40 deletions(-)
create mode 100644 compat/compat-2.6.33.c
create mode 100644 compat/compat-2.6.33.h
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] [compat-2.6] Add IFF_DONT_BRIDGE definition to compat
2009-11-20 22:01 [PATCH 0/3] [compat-2.6] Small fixes Hauke Mehrtens
@ 2009-11-20 22:01 ` Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 2/3] [compat-2.6] Refresh config.mk Hauke Mehrtens
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2009-11-20 22:01 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
The IFF_DONT_BRIDGE flag will not be interpreted by an old kernel, but
it does not hurt the kernel if it is set but not read by the non
wireless network code.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/compat-2.6.33.c | 16 ++++++++++++++++
compat/compat-2.6.33.h | 15 +++++++++++++++
compat/compat.h | 1 +
compat/patches/98-add-compat-wireless.patch | 3 ++-
4 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 compat/compat-2.6.33.c
create mode 100644 compat/compat-2.6.33.h
diff --git a/compat/compat-2.6.33.c b/compat/compat-2.6.33.c
new file mode 100644
index 0000000..2fccadb
--- /dev/null
+++ b/compat/compat-2.6.33.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Compatibility file for Linux wireless for kernels 2.6.33.
+ */
+
+#include <net/compat.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) */
+
diff --git a/compat/compat-2.6.33.h b/compat/compat-2.6.33.h
new file mode 100644
index 0000000..528627e
--- /dev/null
+++ b/compat/compat-2.6.33.h
@@ -0,0 +1,15 @@
+#ifndef LINUX_26_33_COMPAT_H
+#define LINUX_26_33_COMPAT_H
+
+#include <linux/autoconf.h>
+#include <linux/version.h>
+#include <linux/compat_autoconf.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+
+#define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */
+/* source: include/linux/if.h */
+
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) */
+
+#endif /* LINUX_26_33_COMPAT_H */
diff --git a/compat/compat.h b/compat/compat.h
index 05612b2..76e998d 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -21,5 +21,6 @@
#include <net/compat-2.6.30.h>
#include <net/compat-2.6.31.h>
#include <net/compat-2.6.32.h>
+#include <net/compat-2.6.33.h>
#endif /* LINUX_26_COMPAT_H */
diff --git a/compat/patches/98-add-compat-wireless.patch b/compat/patches/98-add-compat-wireless.patch
index e78c63f..0bbf85b 100644
--- a/compat/patches/98-add-compat-wireless.patch
+++ b/compat/patches/98-add-compat-wireless.patch
@@ -20,7 +20,7 @@ added compat.h also for ssb, I forget.
--- a/net/wireless/Makefile 2009-08-07 12:27:50.836497001 -0700
+++ b/net/wireless/Makefile 2009-08-07 12:27:51.952497240 -0700
-@@ -15,3 +15,16 @@
+@@ -15,3 +15,17 @@
cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
ccflags-y += -D__CHECK_ENDIAN__
@@ -36,6 +36,7 @@ added compat.h also for ssb, I forget.
+cfg80211-$(CONFIG_COMPAT_WIRELESS_30) += compat-2.6.30.o
+cfg80211-$(CONFIG_COMPAT_WIRELESS_31) += compat-2.6.31.o
+cfg80211-$(CONFIG_COMPAT_WIRELESS_32) += compat-2.6.32.o
++cfg80211-$(CONFIG_COMPAT_WIRELESS_33) += compat-2.6.33.o
+
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] [compat-2.6] Refresh config.mk
2009-11-20 22:01 [PATCH 0/3] [compat-2.6] Small fixes Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 1/3] [compat-2.6] Add IFF_DONT_BRIDGE definition to compat Hauke Mehrtens
@ 2009-11-20 22:01 ` Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 3/3] [compat-2.6] Refresh patches Hauke Mehrtens
2009-11-21 2:20 ` [PATCH 0/3] [compat-2.6] Small fixes Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2009-11-20 22:01 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Remove some unused symbols and add some new symbols.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/config.mk b/config.mk
index 35d6078..54cbb12 100644
--- a/config.mk
+++ b/config.mk
@@ -70,9 +70,7 @@ ifeq ($(CONFIG_NET_SCHED),)
QOS_REQS_MISSING+=CONFIG_NET_SCHED
endif
-ifeq ($(QOS_REQS_MISSING),) # if our dependencies match for MAC80211_QOS
-CONFIG_MAC80211_QOS=y
-else # Complain about our missing dependencies
+ifneq ($(QOS_REQS_MISSING),) # Complain about our missing dependencies
$(warning "WARNING: You are running a kernel >= 2.6.23, you should enable in it $(QOS_REQS_MISSING) for 802.11[ne] support")
endif
@@ -92,7 +90,9 @@ CONFIG_MAC80211=m
# CONFIG_MAC80211_IBSS_DEBUG=y
# CONFIG_MAC80211_VERBOSE_PS_DEBUG=y
# CONFIG_MAC80211_VERBOSE_MPL_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG=y
# CONFIG_MAC80211_DEBUG_COUNTERS=y
+# CONFIG_MAC80211_DRIVER_API_TRACER=y
# choose between pid and minstrel as default rate control algorithm
CONFIG_MAC80211_RC_DEFAULT=minstrel
@@ -110,7 +110,9 @@ CONFIG_MAC80211_MESH=y
CONFIG_CFG80211=m
CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=1
+# CONFIG_CFG80211_DEBUGFS=y
+# CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_DEVELOPER_WARNINGS=y
# CONFIG_CFG80211_REG_DEBUG=y
# See below for wext stuff
@@ -147,7 +149,6 @@ ifneq ($(CONFIG_PCI),)
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG=y
-CONFIG_ATH5K_RFKILL=y
CONFIG_ATH9K_HW=m
CONFIG_ATH9K=m
# Note: once ath9k_htc is added we'll have to move
@@ -158,11 +159,10 @@ CONFIG_ATH9K_COMMON=m
CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI_RFKILL=y
CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
# CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEBUGFS=y
+# CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_IWLAGN=m
CONFIG_COMPAT_IWL4965=y
CONFIG_IWL5000=y
@@ -179,7 +179,6 @@ CONFIG_B43_PCMCIA=y
endif
CONFIG_B43_PIO=y
CONFIG_B43_LEDS=y
-CONFIG_B43_RFKILL=y
CONFIG_B43_PHY_LP=y
# CONFIG_B43_DEBUG=y
# CONFIG_B43_FORCE_PIO=y
@@ -189,7 +188,6 @@ CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_RFKILL=y
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
@@ -314,6 +312,7 @@ CONFIG_USB_NET_CDCETHER=m
CONFIG_P54_USB=m
CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
CONFIG_AT76C50X_USB=m
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] [compat-2.6] Refresh patches
2009-11-20 22:01 [PATCH 0/3] [compat-2.6] Small fixes Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 1/3] [compat-2.6] Add IFF_DONT_BRIDGE definition to compat Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 2/3] [compat-2.6] Refresh config.mk Hauke Mehrtens
@ 2009-11-20 22:01 ` Hauke Mehrtens
2009-11-21 2:20 ` [PATCH 0/3] [compat-2.6] Small fixes Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2009-11-20 22:01 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/patches/01-netdev.patch | 24 ++++++++++----------
compat/patches/02-ksize.patch | 2 +-
compat/patches/03-rfkill.patch | 20 ++++++++--------
compat/patches/05-usb.patch | 2 +-
| 2 +-
compat/patches/08-rename-iwl4965-config.patch | 2 +-
.../patches/10-add-wext-handlers-to-netdev.patch | 2 +-
compat/patches/13-trace.patch | 2 +-
compat/patches/14-device-type.patch | 2 +-
compat/patches/15-symbol-export-conflicts.patch | 2 +-
10 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch
index 37f2a9e..d66a2f4 100644
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -72,7 +72,7 @@ without creating a headache on maintenance of the pathes.
--- a/drivers/net/wireless/rndis_wlan.c 2009-09-02 14:08:52.418110490 -0700
+++ b/drivers/net/wireless/rndis_wlan.c 2009-09-02 14:08:52.930092180 -0700
-@@ -2667,6 +2667,7 @@
+@@ -2669,6 +2669,7 @@
return 0;
}
@@ -80,7 +80,7 @@ without creating a headache on maintenance of the pathes.
/* same as rndis_netdev_ops but with local multicast handler */
static const struct net_device_ops rndis_wlan_netdev_ops = {
.ndo_open = usbnet_open,
-@@ -2677,6 +2678,7 @@
+@@ -2679,6 +2680,7 @@
.ndo_validate_addr = eth_validate_addr,
.ndo_set_multicast_list = rndis_wlan_set_multicast_list,
};
@@ -88,7 +88,7 @@ without creating a headache on maintenance of the pathes.
static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
{
-@@ -2724,7 +2726,11 @@
+@@ -2726,7 +2728,11 @@
* rndis_host wants to avoid all OID as much as possible
* so do promisc/multicast handling in rndis_wlan.
*/
@@ -157,7 +157,7 @@ without creating a headache on maintenance of the pathes.
sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
MONITOR_FLAG_OTHER_BSS;
break;
-@@ -777,6 +797,8 @@
+@@ -778,6 +798,8 @@
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
@@ -166,7 +166,7 @@ without creating a headache on maintenance of the pathes.
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -785,6 +807,7 @@
+@@ -786,6 +808,7 @@
- ETH_HLEN /* ethernet hard_header_len */
+ IEEE80211_ENCRYPT_HEADROOM;
ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -174,7 +174,7 @@ without creating a headache on maintenance of the pathes.
ret = dev_alloc_name(ndev, ndev->name);
if (ret < 0)
-@@ -819,6 +842,10 @@
+@@ -826,6 +849,10 @@
if (ret)
goto fail;
@@ -335,7 +335,7 @@ without creating a headache on maintenance of the pathes.
priv->wireless_data.libipw = priv->ieee;
--- a/drivers/net/wireless/ipw2x00/ipw2200.c 2009-11-13 11:37:43.000000000 -0800
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c 2009-11-13 11:37:43.000000000 -0800
-@@ -11631,6 +11631,7 @@
+@@ -11546,6 +11546,7 @@
return NETDEV_TX_OK;
}
@@ -343,7 +343,7 @@ without creating a headache on maintenance of the pathes.
static const struct net_device_ops ipw_prom_netdev_ops = {
.ndo_open = ipw_prom_open,
.ndo_stop = ipw_prom_stop,
-@@ -11639,6 +11640,7 @@
+@@ -11554,6 +11555,7 @@
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};
@@ -351,7 +351,7 @@ without creating a headache on maintenance of the pathes.
static int ipw_prom_alloc(struct ipw_priv *priv)
{
-@@ -11659,7 +11661,13 @@
+@@ -11574,7 +11576,13 @@
memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -365,7 +365,7 @@ without creating a headache on maintenance of the pathes.
priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11687,6 +11695,7 @@
+@@ -11602,6 +11610,7 @@
#endif
@@ -373,7 +373,7 @@ without creating a headache on maintenance of the pathes.
static const struct net_device_ops ipw_netdev_ops = {
.ndo_init = ipw_net_init,
.ndo_open = ipw_net_open,
-@@ -11697,6 +11706,7 @@
+@@ -11612,6 +11621,7 @@
.ndo_change_mtu = libipw_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};
@@ -381,7 +381,7 @@ without creating a headache on maintenance of the pathes.
static int __devinit ipw_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
-@@ -11798,7 +11808,15 @@
+@@ -11713,7 +11723,15 @@
priv->ieee->perfect_rssi = -20;
priv->ieee->worst_rssi = -85;
diff --git a/compat/patches/02-ksize.patch b/compat/patches/02-ksize.patch
index 6d97675..48964e2 100644
--- a/compat/patches/02-ksize.patch
+++ b/compat/patches/02-ksize.patch
@@ -12,7 +12,7 @@ of the situation.
--- a/net/wireless/scan.c 2009-09-02 14:13:33.769092519 -0700
+++ b/net/wireless/scan.c 2009-09-02 14:13:34.925094548 -0700
-@@ -422,7 +422,12 @@
+@@ -423,7 +423,12 @@
size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
size_t ielen = res->pub.len_information_elements;
diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch
index 28e0b18..e87f69c 100644
--- a/compat/patches/03-rfkill.patch
+++ b/compat/patches/03-rfkill.patch
@@ -101,7 +101,7 @@ This would do the policing from within mac80211.
static atomic_t rfkill_input_disabled = ATOMIC_INIT(0);
/**
-@@ -777,7 +777,7 @@
+@@ -779,7 +779,7 @@
}
static struct class rfkill_class = {
@@ -110,7 +110,7 @@ This would do the policing from within mac80211.
.dev_release = rfkill_release,
.dev_attrs = rfkill_dev_attrs,
.dev_uevent = rfkill_dev_uevent,
-@@ -923,7 +923,7 @@
+@@ -925,7 +925,7 @@
if (!rfkill->persistent || rfkill_epo_lock_active) {
schedule_work(&rfkill->sync_work);
} else {
@@ -119,7 +119,7 @@ This would do the policing from within mac80211.
bool soft_blocked = !!(rfkill->state & RFKILL_BLOCK_SW);
if (!atomic_read(&rfkill_input_disabled))
-@@ -1151,7 +1151,7 @@
+@@ -1153,7 +1153,7 @@
list_for_each_entry_safe(ev, tmp, &data->events, list)
kfree(ev);
@@ -128,7 +128,7 @@ This would do the policing from within mac80211.
if (data->input_handler)
if (atomic_dec_return(&rfkill_input_disabled) == 0)
printk(KERN_DEBUG "rfkill: input handler enabled\n");
-@@ -1162,7 +1162,7 @@
+@@ -1164,7 +1164,7 @@
return 0;
}
@@ -137,7 +137,7 @@ This would do the policing from within mac80211.
static long rfkill_fop_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
-@@ -1194,7 +1194,7 @@
+@@ -1196,7 +1196,7 @@
.write = rfkill_fop_write,
.poll = rfkill_fop_poll,
.release = rfkill_fop_release,
@@ -146,7 +146,7 @@ This would do the policing from within mac80211.
.unlocked_ioctl = rfkill_fop_ioctl,
.compat_ioctl = rfkill_fop_ioctl,
#endif
-@@ -1224,7 +1224,7 @@
+@@ -1226,7 +1226,7 @@
goto out;
}
@@ -155,7 +155,7 @@ This would do the policing from within mac80211.
error = rfkill_handler_init();
if (error) {
misc_deregister(&rfkill_miscdev);
-@@ -1240,7 +1240,7 @@
+@@ -1242,7 +1242,7 @@
static void __exit rfkill_exit(void)
{
@@ -174,7 +174,7 @@ This would do the policing from within mac80211.
/* define userspace visible states */
#define RFKILL_STATE_SOFT_BLOCKED 0
-@@ -145,7 +146,7 @@
+@@ -148,7 +149,7 @@
int (*set_block)(void *data, bool blocked);
};
@@ -183,7 +183,7 @@ This would do the policing from within mac80211.
/**
* rfkill_alloc - allocate rfkill structure
* @name: name of the struct -- the string is not copied internally
-@@ -352,7 +353,7 @@
+@@ -355,7 +356,7 @@
#endif /* RFKILL || RFKILL_MODULE */
@@ -208,7 +208,7 @@ This would do the policing from within mac80211.
#include <net/cfg80211.h>
--- a/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:38.000000000 -0800
+++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:39.000000000 -0800
-@@ -3254,7 +3254,7 @@
+@@ -3246,7 +3246,7 @@
pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
diff --git a/compat/patches/05-usb.patch b/compat/patches/05-usb.patch
index 174f6ee..9d13a13 100644
--- a/compat/patches/05-usb.patch
+++ b/compat/patches/05-usb.patch
@@ -2,7 +2,7 @@ USB opt soft_unbid was added as of 2.6.27.
--- a/drivers/net/wireless/p54/p54usb.c 2009-09-23 10:28:04.963708264 -0700
+++ b/drivers/net/wireless/p54/p54usb.c 2009-09-23 10:28:05.199734839 -0700
-@@ -1048,7 +1048,9 @@
+@@ -1052,7 +1052,9 @@
.resume = p54u_resume,
.reset_resume = p54u_resume,
#endif /* CONFIG_PM */
--git a/compat/patches/06-header-changes.patch b/compat/patches/06-header-changes.patch
index 14e544a..44f43cf 100644
--- a/compat/patches/06-header-changes.patch
+++ b/compat/patches/06-header-changes.patch
@@ -39,7 +39,7 @@ cases.
+#endif
#include <linux/crc32.h>
#include <linux/etherdevice.h>
-
+ #include <linux/vmalloc.h>
--- a/drivers/net/wireless/wl12xx/wl1251_spi.c 2009-08-07 12:24:58.907526225 -0700
+++ b/drivers/net/wireless/wl12xx/wl1251_spi.c 2009-08-07 12:24:59.199494403 -0700
@@ -24,6 +24,9 @@
diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch
index 997028a..475c15f 100644
--- a/compat/patches/08-rename-iwl4965-config.patch
+++ b/compat/patches/08-rename-iwl4965-config.patch
@@ -16,7 +16,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-13 11:38:35.000000000 -0800
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-13 11:38:36.000000000 -0800
-@@ -3449,10 +3449,10 @@
+@@ -3534,10 +3534,10 @@
/* Hardware specific file defines the PCI IDs table for that hardware module */
static struct pci_device_id iwl_hw_card_ids[] = {
diff --git a/compat/patches/10-add-wext-handlers-to-netdev.patch b/compat/patches/10-add-wext-handlers-to-netdev.patch
index a85aa82..9159613 100644
--- a/compat/patches/10-add-wext-handlers-to-netdev.patch
+++ b/compat/patches/10-add-wext-handlers-to-netdev.patch
@@ -13,7 +13,7 @@ the struct wiphy wireless handler.
--- a/net/wireless/core.c 2009-11-02 08:08:20.000000000 -0800
+++ b/net/wireless/core.c 2009-11-02 08:08:21.000000000 -0800
-@@ -671,6 +671,10 @@
+@@ -673,6 +673,10 @@
wdev->sme_state = CFG80211_SME_IDLE;
mutex_unlock(&rdev->devlist_mtx);
#ifdef CONFIG_CFG80211_WEXT
diff --git a/compat/patches/13-trace.patch b/compat/patches/13-trace.patch
index 144cae5..d3a3dcd 100644
--- a/compat/patches/13-trace.patch
+++ b/compat/patches/13-trace.patch
@@ -35,7 +35,7 @@ in or compat headers.
#include <net/mac80211.h>
#include "ieee80211_i.h"
-@@ -669,4 +671,6 @@ TRACE_EVENT(drv_ampdu_action,
+@@ -672,4 +674,6 @@ TRACE_EVENT(drv_ampdu_action,
#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
#define TRACE_INCLUDE_FILE driver-trace
diff --git a/compat/patches/14-device-type.patch b/compat/patches/14-device-type.patch
index e1eaf34..e8b97e3 100644
--- a/compat/patches/14-device-type.patch
+++ b/compat/patches/14-device-type.patch
@@ -8,7 +8,7 @@ compile warning.
--- a/net/mac80211/iface.c 2009-11-13 11:40:39.000000000 -0800
+++ b/net/mac80211/iface.c 2009-11-13 11:40:39.000000000 -0800
-@@ -777,9 +777,11 @@
+@@ -778,9 +778,11 @@
return 0;
}
diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch
index a7a35d8..2cc25cc 100644
--- a/compat/patches/15-symbol-export-conflicts.patch
+++ b/compat/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
--- a/net/mac80211/rx.c 2009-11-13 11:41:29.000000000 -0800
+++ b/net/mac80211/rx.c 2009-11-13 11:41:30.000000000 -0800
-@@ -2508,7 +2508,12 @@
+@@ -2516,7 +2516,12 @@
drop:
kfree_skb(skb);
}
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] [compat-2.6] Small fixes
2009-11-20 22:01 [PATCH 0/3] [compat-2.6] Small fixes Hauke Mehrtens
` (2 preceding siblings ...)
2009-11-20 22:01 ` [PATCH 3/3] [compat-2.6] Refresh patches Hauke Mehrtens
@ 2009-11-21 2:20 ` Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Luis R. Rodriguez @ 2009-11-21 2:20 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Fri, Nov 20, 2009 at 2:01 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Fix build of compat-wireless and refresh some files.
>
> compat-wireless does not build with kernel 2.6.26 and older, because
> debugfs_remove_recursive is missing. This is not fixed by this patch.
>
> Hauke Mehrtens (3):
> [compat-2.6] Add IFF_DONT_BRIDGE definition to compat
> [compat-2.6] Refresh config.mk
> [compat-2.6] Refresh patches
thanks applied.
Luis
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-21 2:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-20 22:01 [PATCH 0/3] [compat-2.6] Small fixes Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 1/3] [compat-2.6] Add IFF_DONT_BRIDGE definition to compat Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 2/3] [compat-2.6] Refresh config.mk Hauke Mehrtens
2009-11-20 22:01 ` [PATCH 3/3] [compat-2.6] Refresh patches Hauke Mehrtens
2009-11-21 2:20 ` [PATCH 0/3] [compat-2.6] Small fixes Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.