Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in
at 2015-06-12 20:26:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/libcacard.changes 2015-05-20
23:51:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/libcacard.changes 2015-06-12
20:26:16.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Jun 1 21:52:44 UTC 2015 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches added:
+ 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
+
+-------------------------------------------------------------------
+Tue May 26 18:11:43 UTC 2015 - jsl...@suse.com
+
+- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3
+* Patches added:
+ 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2015-05-20
23:51:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes
2015-06-12 20:26:16.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Jun 1 21:52:41 UTC 2015 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches added:
+ 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
+
+-------------------------------------------------------------------
+Tue May 26 18:11:37 UTC 2015 - jsl...@suse.com
+
+- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3
+* Patches added:
+ 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2015-05-20
23:51:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.changes 2015-06-12
20:26:16.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Jun 1 21:52:37 UTC 2015 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+* Patches added:
+ 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
+
+-------------------------------------------------------------------
+Tue May 26 18:11:31 UTC 2015 - jsl...@suse.com
+
+- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3
+* Patches added:
+ 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+ gcc5-ipxe-add-missing-const-qualifiers.patch
+ gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2015-05-20
23:51:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2015-06-12
20:26:16.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Jun 1 21:52:37 UTC 2015 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.3
+- Fix qemu2 cow caching (bsc#933132)
+* Patches added:
+ 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
+
+-------------------------------------------------------------------
+Tue May 26 18:11:31 UTC 2015 - jsl...@suse.com
+
+- Patch queue updated from git://github.com/jirislaby/qemu.git opensuse-2.3
+* Patches added:
+ 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+ gcc5-ipxe-add-missing-const-qualifiers.patch
+ gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
+
+-------------------------------------------------------------------
New:
----
0042-rules.mak-Force-CFLAGS-for-all-obje.patch
0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
gcc5-ipxe-add-missing-const-qualifiers.patch
gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcacard.spec ++++++
--- /var/tmp/diff_new_pack.ePaAdR/_old 2015-06-12 20:26:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ePaAdR/_new 2015-06-12 20:26:20.000000000 +0200
@@ -66,6 +66,8 @@
Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch
+Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+Patch0043: 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -166,6 +168,8 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
+%patch0042 -p1
+%patch0043 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
qemu-linux-user.spec: same change
++++++ qemu-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.ePaAdR/_old 2015-06-12 20:26:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ePaAdR/_new 2015-06-12 20:26:20.000000000 +0200
@@ -97,6 +97,8 @@
Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch
+Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+Patch0043: 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@@ -108,6 +110,8 @@
Patch1001: seabios_checkrom_typo.patch
Patch1002: seabios_avoid_smbios_signature_string.patch
%endif
+Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch
+Patch1101:
gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -598,6 +602,8 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
+%patch0042 -p1
+%patch0043 -p1
%if %{build_x86_fw_from_source}
pushd roms/seabios
@@ -613,6 +619,11 @@
done
%endif
+pushd roms/ipxe
+%patch1100 -p1
+%patch1101 -p1
+popd
+
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.ePaAdR/_old 2015-06-12 20:26:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ePaAdR/_new 2015-06-12 20:26:20.000000000 +0200
@@ -97,6 +97,8 @@
Patch0039: 0039-s390x-Fix-stoc-direction.patch
Patch0040: 0040-s390x-Add-interlocked-access-facili.patch
Patch0041: 0041-fdc-force-the-fifo-access-to-be-in-.patch
+Patch0042: 0042-rules.mak-Force-CFLAGS-for-all-obje.patch
+Patch0043: 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@@ -108,6 +110,8 @@
Patch1001: seabios_checkrom_typo.patch
Patch1002: seabios_avoid_smbios_signature_string.patch
%endif
+Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch
+Patch1101:
gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -598,6 +602,8 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
+%patch0042 -p1
+%patch0043 -p1
%if %{build_x86_fw_from_source}
pushd roms/seabios
@@ -613,6 +619,11 @@
done
%endif
+pushd roms/ipxe
+%patch1100 -p1
+%patch1101 -p1
+popd
+
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
++++++ 0042-rules.mak-Force-CFLAGS-for-all-obje.patch ++++++
>From d65736f0043d2393dc3a4fce25d806f7ff1b406b Mon Sep 17 00:00:00 2001
From: Fam Zheng <f...@redhat.com>
Date: Thu, 7 May 2015 14:55:15 +0800
Subject: [PATCH] rules.mak: Force CFLAGS for all objects in DSO
Because of the trick of process-archive-undefs, all .mo objects, even
with --enable-modules, are dependencies of executables.
This breaks CFLAGS propogation because the compiling of module object
will happen too early before building for DSO.
With GCC 5, the linking would fail because .o doesn't have -fPIC. Also,
BUILD_DSO will be missed. (module-common.o will have it, so the stamp
symbol was still liked in .so).
Fix the problem by forcing the CFLAGS on individual .o-cflags during
unnest-vars.
Reported-by: Alexander Graf <ag...@suse.de>
Signed-off-by: Fam Zheng <f...@redhat.com>
Cc: qemu-sta...@nongnu.org # 2.3
Message-Id: <1430981715-31465-1-git-send-email-f...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
(cherry picked from commit d24697e1824467f3921c84a94f011f43d6466403)
Signed-off-by: Bruce Rogers <brog...@suse.com>
Signed-off-by: Jiri Slaby <jsl...@suse.com>
---
rules.mak | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/rules.mak b/rules.mak
index 3a05627..aec27f8 100644
--- a/rules.mak
+++ b/rules.mak
@@ -102,7 +102,8 @@ endif
%.o: %.dtrace
$(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@")
-%$(DSOSUF): CFLAGS += -fPIC -DBUILD_DSO
+DSO_OBJ_CFLAGS := -fPIC -DBUILD_DSO
+module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)
%$(DSOSUF): LDFLAGS += $(LDFLAGS_SHARED)
%$(DSOSUF): %.mo
$(call LINK,$^)
@@ -351,6 +352,7 @@ define unnest-vars
# For non-module build, add -m to -y
$(if $(CONFIG_MODULES),
$(foreach o,$($v),
+ $(eval $($o-objs): CFLAGS += $(DSO_OBJ_CFLAGS))
$(eval $o: $($o-objs)))
$(eval $(patsubst %-m,%-y,$v) += $($v))
$(eval modules: $($v:%.mo=%$(DSOSUF))),
++++++ 0043-qcow2-Set-MIN_L2_CACHE_SIZE-to-2.patch ++++++
>From 85bd20ed57493f867626fd7d5fa073b4476ae301 Mon Sep 17 00:00:00 2001
From: Max Reitz <mre...@redhat.com>
Date: Mon, 1 Jun 2015 18:09:17 +0200
Subject: [PATCH] qcow2: Set MIN_L2_CACHE_SIZE to 2
The L2 cache must cover at least two L2 tables, because during COW two
L2 tables are accessed simultaneously.
Reported-by: Alexander Graf <ag...@suse.de>
Signed-off-by: Max Reitz <mre...@redhat.com>
Tested-by: Alexander Graf <ag...@suse.de>
Reviewed-by: Alberto Garcia <be...@igalia.com>
Signed-off-by: Alexander Graf <ag...@suse.de>
---
block/qcow2.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.h b/block/qcow2.h
index 422b825..2f20949 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -62,7 +62,8 @@
#define MIN_CLUSTER_BITS 9
#define MAX_CLUSTER_BITS 21
-#define MIN_L2_CACHE_SIZE 1 /* cluster */
+/* Must be at least 2 to cover COW */
+#define MIN_L2_CACHE_SIZE 2 /* clusters */
/* Must be at least 4 to cover all cases of refcount table growth */
#define MIN_REFCOUNT_CACHE_SIZE 4 /* clusters */
++++++ gcc5-ipxe-add-missing-const-qualifiers.patch ++++++
>From bf40b79734a070cea4dd4c74b50d3bf73fdc6061 Mon Sep 17 00:00:00 2001
From: Christian Hesse <m...@eworm.de>
Date: Thu, 23 Apr 2015 13:33:25 +0200
Subject: [PATCH] [build] Add missing "const" qualifiers
This fixes "initialization discards 'const' qualifier from pointer
target type" warnings with GCC 5.1.0.
Signed-off-by: Christian Hesse <m...@eworm.de>
Modified-by: Michael Brown <mc...@ipxe.org>
Signed-off-by: Michael Brown <mc...@ipxe.org>
---
src/net/tls.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/net/tls.c b/src/net/tls.c
index 30ccc93..8f4bec7 100644
--- a/src/net/tls.c
+++ b/src/net/tls.c
@@ -1637,9 +1637,9 @@ static int tls_new_handshake ( struct tls_session *tls,
uint8_t length[3];
uint8_t payload[0];
} __attribute__ (( packed )) *handshake = data;
- void *payload = &handshake->payload;
+ const void *payload = &handshake->payload;
size_t payload_len = tls_uint24 ( handshake->length );
- void *next = ( payload + payload_len );
+ const void *next = ( payload + payload_len );
/* Sanity check */
if ( next > end ) {
--
1.7.0.4
++++++ gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
++++++
From: Christian Hesse <m...@eworm.de>
Date: Thu, 23 Apr 2015 13:33:26 +0200
Subject: [ath9k] Remove confusing logic inversion in an ANI variable
Patch-mainline: no
This changed in Linux kernel the same way in commit 7067e701
("ath9k_hw: remove confusing logic inversion in an ANI variable") by
Felix Fietkau.
Additionally this fixes "error: logical not is only applied to the
left hand side of comparison" with GCC 5.1.0.
Signed-off-by: Christian Hesse <m...@eworm.de>
Signed-off-by: Michael Brown <mc...@ipxe.org>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
src/drivers/net/ath/ath9k/ani.h | 2 +-
src/drivers/net/ath/ath9k/ath9k_ani.c | 16 ++++++++--------
src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c | 18 +++++++++---------
src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/drivers/net/ath/ath9k/ani.h b/src/drivers/net/ath/ath9k/ani.h
index dbd4d4d5bc12..ba87ba0fd258 100644
--- a/src/drivers/net/ath/ath9k/ani.h
+++ b/src/drivers/net/ath/ath9k/ani.h
@@ -125,7 +125,7 @@ struct ar5416AniState {
u8 mrcCCKOff;
u8 spurImmunityLevel;
u8 firstepLevel;
- u8 ofdmWeakSigDetectOff;
+ u8 ofdmWeakSigDetect;
u8 cckWeakSigThreshold;
u32 listenTime;
int32_t rssiThrLow;
diff --git a/src/drivers/net/ath/ath9k/ath9k_ani.c
b/src/drivers/net/ath/ath9k/ath9k_ani.c
index ff7df497fc92..76ca79cba3e8 100644
--- a/src/drivers/net/ath/ath9k/ath9k_ani.c
+++ b/src/drivers/net/ath/ath9k/ath9k_ani.c
@@ -177,7 +177,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw
*ah)
rssi = BEACON_RSSI(ah);
if (rssi > aniState->rssiThrHigh) {
- if (!aniState->ofdmWeakSigDetectOff) {
+ if (aniState->ofdmWeakSigDetect) {
if (ath9k_hw_ani_control(ah,
ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
0)) {
@@ -192,7 +192,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw
*ah)
return;
}
} else if (rssi > aniState->rssiThrLow) {
- if (aniState->ofdmWeakSigDetectOff)
+ if (!aniState->ofdmWeakSigDetect)
ath9k_hw_ani_control(ah,
ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
1);
@@ -202,7 +202,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw
*ah)
return;
} else {
if ((ah->dev->channels + ah->dev->channel)->band ==
NET80211_BAND_2GHZ) {
- if (!aniState->ofdmWeakSigDetectOff)
+ if (aniState->ofdmWeakSigDetect)
ath9k_hw_ani_control(ah,
ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
0);
@@ -360,7 +360,7 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw
*ah)
if (rssi > aniState->rssiThrHigh) {
/* XXX: Handle me */
} else if (rssi > aniState->rssiThrLow) {
- if (aniState->ofdmWeakSigDetectOff) {
+ if (!aniState->ofdmWeakSigDetect) {
if (ath9k_hw_ani_control(ah,
ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
1) == 1)
@@ -436,9 +436,9 @@ static void ath9k_ani_reset_old(struct ath_hw *ah)
if (aniState->spurImmunityLevel != 0)
ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
aniState->spurImmunityLevel);
- if (aniState->ofdmWeakSigDetectOff)
+ if (!aniState->ofdmWeakSigDetect)
ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- !aniState->ofdmWeakSigDetectOff);
+ aniState->ofdmWeakSigDetect);
if (aniState->cckWeakSigThreshold)
ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
aniState->cckWeakSigThreshold);
@@ -709,8 +709,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
- ani->ofdmWeakSigDetectOff =
- !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+ ani->ofdmWeakSigDetect =
+ ATH9K_ANI_USE_OFDM_WEAK_SIG;
ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
}
diff --git a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
index 60e87e9e2625..2b6c133cb783 100644
--- a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
+++ b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c
@@ -1141,12 +1141,12 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah,
REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- if (!on != aniState->ofdmWeakSigDetectOff) {
+ if (on != aniState->ofdmWeakSigDetect) {
if (on)
ah->stats.ast_ani_ofdmon++;
else
ah->stats.ast_ani_ofdmoff++;
- aniState->ofdmWeakSigDetectOff = !on;
+ aniState->ofdmWeakSigDetect = on;
}
break;
}
@@ -1215,10 +1215,10 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah,
DBG2("ath9k: ANI parameters:\n");
DBG2(
- "noiseImmunityLevel=%d, spurImmunityLevel=%d,
ofdmWeakSigDetectOff=%d\n",
+ "noiseImmunityLevel=%d, spurImmunityLevel=%d,
ofdmWeakSigDetect=%d\n",
aniState->noiseImmunityLevel,
aniState->spurImmunityLevel,
- !aniState->ofdmWeakSigDetectOff);
+ aniState->ofdmWeakSigDetect);
DBG2(
"cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n",
aniState->cckWeakSigThreshold,
@@ -1307,18 +1307,18 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah,
REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- if (!on != aniState->ofdmWeakSigDetectOff) {
+ if (on != aniState->ofdmWeakSigDetect) {
DBG2("ath9k: "
"** ch %d: ofdm weak signal: %s=>%s\n",
chan->channel,
- !aniState->ofdmWeakSigDetectOff ?
+ aniState->ofdmWeakSigDetect ?
"on" : "off",
on ? "on" : "off");
if (on)
ah->stats.ast_ani_ofdmon++;
else
ah->stats.ast_ani_ofdmoff++;
- aniState->ofdmWeakSigDetectOff = !on;
+ aniState->ofdmWeakSigDetect = on;
}
break;
}
@@ -1467,7 +1467,7 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah,
DBG2("ath9k: "
"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d
ofdmErrs=%d cckErrs=%d\n",
aniState->spurImmunityLevel,
- !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+ aniState->ofdmWeakSigDetect ? "on" : "off",
aniState->firstepLevel,
!aniState->mrcCCKOff ? "on" : "off",
aniState->listenTime,
@@ -1554,7 +1554,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw
*ah)
/* these levels just got reset to defaults by the INI */
aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
aniState->mrcCCKOff = 1; /* not available on pre AR9003 */
}
diff --git a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
index 6103040abfb2..2244b775a6be 100644
--- a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
+++ b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c
@@ -859,18 +859,18 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
- if (!on != aniState->ofdmWeakSigDetectOff) {
+ if (on != aniState->ofdmWeakSigDetect) {
DBG2("ath9k: "
"** ch %d: ofdm weak signal: %s=>%s\n",
chan->channel,
- !aniState->ofdmWeakSigDetectOff ?
+ aniState->ofdmWeakSigDetect ?
"on" : "off",
on ? "on" : "off");
if (on)
ah->stats.ast_ani_ofdmon++;
else
ah->stats.ast_ani_ofdmoff++;
- aniState->ofdmWeakSigDetectOff = !on;
+ aniState->ofdmWeakSigDetect = on;
}
break;
}
@@ -1013,7 +1013,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
AR_PHY_MRC_CCK_ENABLE, is_on);
REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
AR_PHY_MRC_CCK_MUX_REG, is_on);
- if (!is_on != aniState->mrcCCKOff) {
+ if (!(is_on != aniState->mrcCCKOff)) {
DBG2("ath9k: "
"** ch %d: MRC CCK: %s=>%s\n",
chan->channel,
@@ -1037,7 +1037,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah,
DBG2("ath9k: "
"ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d
ofdmErrs=%d cckErrs=%d\n",
aniState->spurImmunityLevel,
- !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+ aniState->ofdmWeakSigDetect ? "on" : "off",
aniState->firstepLevel,
!aniState->mrcCCKOff ? "on" : "off",
aniState->listenTime,
@@ -1137,7 +1137,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw
*ah)
/* these levels just got reset to defaults by the INI */
aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
}
--
2.4.1
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.ePaAdR/_old 2015-06-12 20:26:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ePaAdR/_new 2015-06-12 20:26:20.000000000 +0200
@@ -68,6 +68,8 @@
Patch1001: seabios_checkrom_typo.patch
Patch1002: seabios_avoid_smbios_signature_string.patch
%endif
+Patch1100: gcc5-ipxe-add-missing-const-qualifiers.patch
+Patch1101:
gcc5-ipxe-ath9k-Remove-confusing-logic-inversion-in-an-ANI-var.patch
# this is to make lint happy
Source300: qemu-rpmlintrc
@@ -533,6 +535,11 @@
done
%endif
+pushd roms/ipxe
+%patch1100 -p1
+%patch1101 -p1
+popd
+
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libdir=%_libdir \
