rpms/kernel/devel fix-staging-at76.patch, NONE, 1.1 patch-2.6.29-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.1040, 1.1041 config-generic, 1.268, 1.269 config-powerpc-generic, 1.40, 1.41 config-powerpc64, 1.28, 1.29 config-x86-generic, 1.74, 1.75 config-x86_64-generic, 1.73, 1.74 kernel.spec, 1.1490, 1.1491 sources, 1.1002, 1.1003 upstream, 1.913, 1.914 patch-2.6.29-git6.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Tue Mar 31 04:09:32 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1418
Modified Files:
.cvsignore config-generic config-powerpc-generic
config-powerpc64 config-x86-generic config-x86_64-generic
kernel.spec sources upstream
Added Files:
fix-staging-at76.patch patch-2.6.29-git7.bz2.sign
Removed Files:
patch-2.6.29-git6.bz2.sign
Log Message:
* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.29-git7
- fix-staging-at76.patch: pull patch from linux-wireless to fix...
fix-staging-at76.patch:
--- NEW FILE fix-staging-at76.patch ---
Jason Andryuk noticed that at76_usb won't compile with current
wireless-testing tree. This is because net/ieee80211.h was missing.
net/ieee80211.h will be removed soon and at76_usb won't compile then that
happens. Preprare for that by using instead linux/ieee80211.h and copying
some structures not available.
Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
---
drivers/staging/at76_usb/at76_usb.c | 18 ++++---
drivers/staging/at76_usb/at76_usb.h | 87 +++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index c8e4d31..1d8eaf8 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -36,7 +36,7 @@
#include <net/ieee80211_radiotap.h>
#include <linux/firmware.h>
#include <linux/leds.h>
-#include <net/ieee80211.h>
+#include <linux/ieee80211.h>
#include "at76_usb.h"
@@ -1727,12 +1727,12 @@ static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)
/* write TLV data elements */
- ie->id = MFIE_TYPE_SSID;
+ ie->id = WLAN_EID_SSID;
ie->len = bss->ssid_len;
memcpy(ie->data, bss->ssid, bss->ssid_len);
next_ie(&ie);
- ie->id = MFIE_TYPE_RATES;
+ ie->id = WLAN_EID_SUPP_RATES;
ie->len = sizeof(hw_rates);
memcpy(ie->data, hw_rates, sizeof(hw_rates));
next_ie(&ie); /* ie points behind the supp_rates field */
@@ -4397,7 +4397,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv,
switch (ie->id) {
- case MFIE_TYPE_SSID:
+ case WLAN_EID_SSID:
if (have_ssid)
break;
@@ -4420,7 +4420,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv,
have_ssid = 1;
break;
- case MFIE_TYPE_RATES:
+ case WLAN_EID_SUPP_RATES:
if (have_rates)
break;
@@ -4433,7 +4433,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv,
hex2str(ie->data, ie->len));
break;
- case MFIE_TYPE_DS_SET:
+ case WLAN_EID_DS_PARAMS:
if (have_channel)
break;
@@ -4443,9 +4443,9 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv,
priv->netdev->name, match->channel);
break;
- case MFIE_TYPE_CF_SET:
- case MFIE_TYPE_TIM:
- case MFIE_TYPE_IBSS_SET:
+ case WLAN_EID_CF_PARAMS:
+ case WLAN_EID_TIM:
+ case WLAN_EID_IBSS_PARAMS:
default:
at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s",
priv->netdev->name, ie->id, ie->len,
diff --git a/drivers/staging/at76_usb/at76_usb.h b/drivers/staging/at76_usb/at76_usb.h
index b20be9d..6d60c6e 100644
--- a/drivers/staging/at76_usb/at76_usb.h
+++ b/drivers/staging/at76_usb/at76_usb.h
@@ -22,6 +22,93 @@
#ifndef _AT76_USB_H
#define _AT76_USB_H
+/*
+ * ieee80211 definitions copied from net/ieee80211.h
+ */
+
+#define WEP_KEY_LEN 13
+#define WEP_KEYS 4
+
+#define IEEE80211_DATA_LEN 2304
+/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
+ 6.2.1.1.2.
+
+ The figure in section 7.1.2 suggests a body size of up to 2312
+ bytes is allowed, which is a bit confusing, I suspect this
+ represents the 2304 bytes of real data, plus a possible 8 bytes of
+ WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
+
+#define IEEE80211_1ADDR_LEN 10
+#define IEEE80211_2ADDR_LEN 16
+#define IEEE80211_3ADDR_LEN 24
+#define IEEE80211_4ADDR_LEN 30
+#define IEEE80211_FCS_LEN 4
+#define IEEE80211_HLEN (IEEE80211_4ADDR_LEN)
+#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)
+
+#define MIN_FRAG_THRESHOLD 256U
+#define MAX_FRAG_THRESHOLD 2346U
+
+struct ieee80211_info_element {
+ u8 id;
+ u8 len;
+ u8 data[0];
+} __attribute__ ((packed));
+
+struct ieee80211_hdr_3addr {
+ __le16 frame_ctl;
+ __le16 duration_id;
+ u8 addr1[ETH_ALEN];
+ u8 addr2[ETH_ALEN];
+ u8 addr3[ETH_ALEN];
+ __le16 seq_ctl;
+ u8 payload[0];
+} __attribute__ ((packed));
+
+struct ieee80211_auth {
+ struct ieee80211_hdr_3addr header;
+ __le16 algorithm;
+ __le16 transaction;
+ __le16 status;
+ /* challenge */
+ struct ieee80211_info_element info_element[0];
+} __attribute__ ((packed));
+
+struct ieee80211_assoc_request {
+ struct ieee80211_hdr_3addr header;
+ __le16 capability;
+ __le16 listen_interval;
+ /* SSID, supported rates, RSN */
+ struct ieee80211_info_element info_element[0];
+} __attribute__ ((packed));
+
+struct ieee80211_probe_response {
+ struct ieee80211_hdr_3addr header;
+ __le32 time_stamp[2];
+ __le16 beacon_interval;
+ __le16 capability;
+ /* SSID, supported rates, FH params, DS params,
+ * CF params, IBSS params, TIM (if beacon), RSN */
+ struct ieee80211_info_element info_element[0];
+} __attribute__ ((packed));
+
+/* Alias beacon for probe_response */
+#define ieee80211_beacon ieee80211_probe_response
+
+struct ieee80211_assoc_response {
+ struct ieee80211_hdr_3addr header;
+ __le16 capability;
+ __le16 status;
+ __le16 aid;
+ /* supported rates */
+ struct ieee80211_info_element info_element[0];
+} __attribute__ ((packed));
+
+struct ieee80211_disassoc {
+ struct ieee80211_hdr_3addr header;
+ __le16 reason;
+} __attribute__ ((packed));
+
/* Board types */
enum board_type {
BOARD_503_ISL3861 = 1,
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--- NEW FILE patch-2.6.29-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJ0V2SyGugalF9Dw4RAmUVAJ4vwiv2DL2f9+JE82lkAy4CfB+f4ACgjJQs
n1YR7j3CDkomZ9bRgbHZNOg=
=tZBd
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1040
retrieving revision 1.1041
diff -u -r1.1040 -r1.1041
--- .cvsignore 31 Mar 2009 01:14:01 -0000 1.1040
+++ .cvsignore 31 Mar 2009 04:09:01 -0000 1.1041
@@ -5,4 +5,4 @@
temp-*
kernel-2.6.29
linux-2.6.29.tar.bz2
-patch-2.6.29-git6.bz2
+patch-2.6.29-git7.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- config-generic 31 Mar 2009 01:14:01 -0000 1.268
+++ config-generic 31 Mar 2009 04:09:01 -0000 1.269
@@ -2294,7 +2294,7 @@
CONFIG_RADIO_MAESTRO=m
CONFIG_MEDIA_ATTACH=y
-# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
#
# Digital Video Broadcasting Devices
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-powerpc-generic 31 Mar 2009 01:14:01 -0000 1.40
+++ config-powerpc-generic 31 Mar 2009 04:09:01 -0000 1.41
@@ -116,6 +116,8 @@
# CONFIG_SGI_IOC4 is not set
CONFIG_PPC_EFIKA=y
+CONFIG_PPC_MEDIA5200=y
+
# CONFIG_PPC_LITE5200 is not set
CONFIG_PPC_BESTCOMM=y
CONFIG_PMAC_RACKMETER=m
@@ -253,8 +255,10 @@
# CONFIG_PPC_SMLPAR is not set
CONFIG_MGCOGE=y
-### breaks usb on mac...? #486511
-# CONFIG_GEF_SBC610 is not set
+CONFIG_GEF_SBC610=y
+CONFIG_GEF_PPC9A=y
+CONFIG_GEF_SBC310=y
+
CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y
CONFIG_MPC8xxx_GPIO=y
@@ -302,3 +306,9 @@
# CONFIG_FHCI_DEBUG is not set
# CONFIG_DRM_RADEON_KMS is not set
+
+CONFIG_AMIGAONE=y
+
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+
+CONFIG_DTL=y
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-powerpc64 12 Mar 2009 03:23:02 -0000 1.28
+++ config-powerpc64 31 Mar 2009 04:09:01 -0000 1.29
@@ -40,6 +40,7 @@
CONFIG_CBE_THERM=m
CONFIG_CBE_CPUFREQ=m
CONFIG_CBE_CPUFREQ_PMI=m
+CONFIG_CBE_CPUFREQ_PMI_ENABLE=y
CONFIG_PMAC_RACKMETER=m
CONFIG_IBMEBUS=y
CONFIG_SPU_FS=m
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- config-x86-generic 31 Mar 2009 01:14:01 -0000 1.74
+++ config-x86-generic 31 Mar 2009 04:09:01 -0000 1.75
@@ -70,6 +70,7 @@
CONFIG_MICROCODE=m
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
# CONFIG_NUMA is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- config-x86_64-generic 31 Mar 2009 01:14:01 -0000 1.73
+++ config-x86_64-generic 31 Mar 2009 04:09:01 -0000 1.74
@@ -8,6 +8,7 @@
# CONFIG_X86_UV is not set
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
CONFIG_MTRR=y
CONFIG_NUMA=y
CONFIG_K8_NUMA=y
@@ -35,6 +36,8 @@
CONFIG_DMAR_FLOPPY_WA=y
# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_KEXEC_JUMP=y
+
CONFIG_EFI=y
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1490
retrieving revision 1.1491
diff -u -r1.1490 -r1.1491
--- kernel.spec 31 Mar 2009 01:14:01 -0000 1.1490
+++ kernel.spec 31 Mar 2009 04:09:01 -0000 1.1491
@@ -58,7 +58,7 @@
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -649,6 +649,7 @@
Patch680: linux-2.6-rt2x00-asus-leds.patch
Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch683: fix-staging-at76.patch
Patch1515: linux-2.6.29-lirc.patch
@@ -1232,6 +1233,7 @@
# back-port scan result aging patches
#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
#ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+ApplyPatch fix-staging-at76.patch
# http://www.lirc.org/
ApplyPatch linux-2.6.29-lirc.patch
@@ -1281,8 +1283,8 @@
#ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
-ApplyPatch linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-ApplyPatch linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+#ApplyPatch linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
+#ApplyPatch linux-2.6.29-pat-pci-change-prot-for-inherit.patch
ApplyPatch linux-2.6.29-pat-fixes.patch
# END OF PATCH APPLICATIONS
@@ -1868,6 +1870,10 @@
# and build.
%changelog
+* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-git7
+- fix-staging-at76.patch: pull patch from linux-wireless to fix...
+
* Mon Mar 30 2009 Kyle McMartin <kyle at redhat.com> 2.6.30-0.28.rc0.git6
- Linux 2.6.29-git6
- Bunch of stuff disabled, most merged, some needs rebasing.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -r1.1002 -r1.1003
--- sources 31 Mar 2009 01:14:01 -0000 1.1002
+++ sources 31 Mar 2009 04:09:01 -0000 1.1003
@@ -1,2 +1,2 @@
64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2
-30eaabe04a80ef170f5b45876317c570 patch-2.6.29-git6.bz2
+1795be759daffc747e4617e730309a0c patch-2.6.29-git7.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- upstream 31 Mar 2009 01:14:02 -0000 1.913
+++ upstream 31 Mar 2009 04:09:01 -0000 1.914
@@ -1,2 +1,2 @@
linux-2.6.29.tar.bz2
-patch-2.6.29-git6.bz2
+patch-2.6.29-git7.bz2
--- patch-2.6.29-git6.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list