mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 20:43:38 +02:00
pentoo-sources: unbroke my last commit
This commit is contained in:
Zero_Chaos
parent
97f80d13bb
commit
cb77be9bc0
4 changed files with 27 additions and 51 deletions
|
|
@ -1,10 +1,11 @@
|
|||
AUX 0001-ath5k-retain-promiscuous-setting.patch 1638 RMD160 4773f57d068f13c8aaa945ce849033e75fb9cde1 SHA1 eed362eecf29bdc9a2333348514956f5ae36ab48 SHA256 c125640e535c9add6422435f72f136f9d4eac4d3655598dccc9b6f2214a3a507
|
||||
AUX 4001-ath5k-retain-promiscuous-setting.patch 803 RMD160 8d4a4c05b0ac5977d7efa957ecd01b6bf1fc809c SHA1 7fec19528d2969fce7ea67ed120e17cd6b984777 SHA256 4bd3b1839b47d29b03d4af1067a6c50d4e763a87827c692d18cbad672399b414
|
||||
AUX openfile_log.patch 732 RMD160 7c7a51381026e766095fe125f3092a23a456eb1e SHA1 11d958a6da186bc4429c481bf5b3ba66ef3b8265 SHA256 a4539dcdc9fb70d7f2c87f1e41b72c10930c49d025bd82563d0c9ee9982345af
|
||||
DIST deblob-2.6.28 72502 RMD160 a3f0a12e0c6312dfc7cacd0e81a50e57519b8df3 SHA1 5a7fb26f3c0c9855bb85431fa29fc285a19f7346 SHA256 432213f8caf6dc534a68dfb321dd33177f93c2fbdd57928a61e49947dd49f25c
|
||||
DIST deblob-2.6.29 76155 RMD160 b56288e338c16ec6aafd5d9146bd4dc8ae82d2ba SHA1 ab846a78ee43e2efd90417494cafe9dfa5b2d089 SHA256 ce0805a2767a1139fd952232eae04814c8910d0629963c2dc1e83449bc6a4987
|
||||
DIST deblob-2.6.30 79041 RMD160 7671b56dd4357eba1aa8097f02b5d7ccc9c86422 SHA1 c282c2c77d38618da7ac8fc5adb0663a0d4bdaa3 SHA256 e1f6ba1eec8ea0de1c4099a066512dfbc53ca5c6527e7593ba0d4e85b36b626d
|
||||
DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
|
||||
DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
|
||||
DIST deblob-2.6.34 88276 RMD160 12f83200b74a9d859b7241b1e8d8c0250d8bcb90 SHA1 985bd73ebca8e720f92eb01d11c22e25d21865b6 SHA256 9478ada7a36f3858ef9ba3dc5c9609fb45fa9b286a002ccfba09045c81b217ed
|
||||
DIST genpatches-2.6.23-10.base.tar.bz2 142831 RMD160 ecc87068363b338ac61d60269d7975379f73c287 SHA1 b36266ab55d4ea61aee47aad10ab2c948bb79d03 SHA256 b4280708eeeb4b2f98265969d9c4e182238a0c6388427699d433a15793eebaef
|
||||
DIST genpatches-2.6.28-7.base.tar.bz2 180022 RMD160 a73a586284962243eb79562c0a73f2d9833902a8 SHA1 a24244a3b9e64ef735e1e2bd0dda27af8b6510c4 SHA256 9119e3048c69ed454925f58eaa1148ccb36cb0a76453f89c7117430c7ce841aa
|
||||
DIST genpatches-2.6.28-7.extras.tar.bz2 42243 RMD160 d83c72599a0718c605433040d26ca2eec8dbff11 SHA1 2504ac8a94fa163cc15d819ab84b0a0a984114ea SHA256 f40b1ec84f4c9ba5808854d9b9f79af725e728fef223cc38b4db5f59c7e9a80a
|
||||
|
|
@ -45,5 +46,5 @@ EBUILD pentoo-sources-2.6.31-r3.ebuild 845 RMD160 9e2ca23282f79b329fe7cdc8d49729
|
|||
EBUILD pentoo-sources-2.6.32-r4.ebuild 842 RMD160 267199dac04d8ea94a1f58a5e2c17b4895d724bb SHA1 fb8437531d361695600a061329ad45de094edc1f SHA256 ed9e5a33630a6ab7fe5b7e66ef962cde34b4522c88a39480c46cc7fb17500de1
|
||||
EBUILD pentoo-sources-2.6.32-r5.ebuild 1730 RMD160 cceac1598b129fc81347af4d83884ecccdf26e00 SHA1 9f1ddd9491a38840ba08a06d87c2bee44b17cbcc SHA256 c59ca79599b103f4d1372eb110450ae46140e34de861775e2872f010a54fb0c1
|
||||
EBUILD pentoo-sources-2.6.34-r1.ebuild 1211 RMD160 6c831259e475debb606cb07340e641ba9ff91738 SHA1 97bfbd54fa03975b9eac46784900755ba8371ddf SHA256 eb66134cb16db2ca8f7178e218bac94036421f1e3020dc8ed2bbcf3d64760c5d
|
||||
EBUILD pentoo-sources-2.6.34-r2.ebuild 1277 RMD160 7672f38a9837e53770a86d2ddf282574425ca7e1 SHA1 5bb83b5ecbd592f48df2af85b794267b291ce22c SHA256 0bf4632257f3e15cad6ccb674b007349bea8e881e0c257a9d224e30a4fb4876c
|
||||
EBUILD pentoo-sources-2.6.34-r2.ebuild 1296 RMD160 0ef534662d815e9ddd7bac9b706ec8b52239870a SHA1 98732eaa780bf1af57d551a7f6a08cc698d38c77 SHA256 83bc6d4e9c405ed0f118a68de9f9b9bbb40c936576502670a76298f00f5bf451
|
||||
EBUILD pentoo-sources-2.6.34.ebuild 1063 RMD160 8bc636532d43098fc0e6d0d4f5c0de3682d327e4 SHA1 2b7af780c0700da75ea62790c47f0b7e88827ebc SHA256 0a76c8ca6009ae798e94a5da1762602af3182c533feb59aff788f33cfd639459
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
From befe47a84a22312e0547d04cd3d250b0e49ecf54 Mon Sep 17 00:00:00 2001
|
||||
From: Bob Copeland <me@bobcopeland.com>
|
||||
Date: Thu, 27 May 2010 08:54:38 -0400
|
||||
Subject: [PATCH] ath5k: retain promiscuous setting
|
||||
|
||||
Commit 56d1de0a21db28e41741cfa0a66e18bc8d920554, "ath5k: clean up
|
||||
filter flags setting" introduced a regression in monitor mode such
|
||||
that the promisc filter flag would get lost.
|
||||
|
||||
Although we set the promisc flag when it changed, we did not
|
||||
preserve it across subsequent calls to configure_filter. This patch
|
||||
restores the original functionality.
|
||||
|
||||
Cc: stable@kernel.org
|
||||
Signed-off-by: Bob Copeland <me@bobcopeland.com>
|
||||
---
|
||||
|
||||
Note, a better fix would be to just unconditionally look at new_flags,
|
||||
but this is the minimal change for stable. I'll add fixing all this
|
||||
stuff up to my todo.
|
||||
|
||||
drivers/net/wireless/ath/ath5k/base.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
|
||||
index 9c27623..9e023b8 100644
|
||||
--- a/drivers/net/wireless/ath/ath5k/base.c
|
||||
+++ b/drivers/net/wireless/ath/ath5k/base.c
|
||||
@@ -3153,13 +3153,15 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
|
||||
|
||||
if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
|
||||
if (*new_flags & FIF_PROMISC_IN_BSS) {
|
||||
- rfilt |= AR5K_RX_FILTER_PROM;
|
||||
__set_bit(ATH_STAT_PROMISC, sc->status);
|
||||
} else {
|
||||
__clear_bit(ATH_STAT_PROMISC, sc->status);
|
||||
}
|
||||
}
|
||||
|
||||
+ if (test_bit(ATH_STAT_PROMISC, sc->status))
|
||||
+ rfilt |= AR5K_RX_FILTER_PROM;
|
||||
+
|
||||
/* Note, AR5K_RX_FILTER_MCAST is already enabled */
|
||||
if (*new_flags & FIF_ALLMULTI) {
|
||||
mfilt[0] = ~0;
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff -Naur linux-2.6.34-pentoo-r1/drivers/net/wireless/ath/ath5k/base.c linux-2.6.34-pentoo-r2/drivers/net/wireless/ath/ath5k/base.c
|
||||
--- linux-2.6.34-pentoo-r1/drivers/net/wireless/ath/ath5k/base.c 2010-05-16 17:17:36.000000000 -0400
|
||||
+++ linux-2.6.34-pentoo-r2/drivers/net/wireless/ath/ath5k/base.c 2010-05-29 10:37:55.000000000 -0400
|
||||
@@ -2993,13 +2993,15 @@
|
||||
|
||||
if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
|
||||
if (*new_flags & FIF_PROMISC_IN_BSS) {
|
||||
- rfilt |= AR5K_RX_FILTER_PROM;
|
||||
__set_bit(ATH_STAT_PROMISC, sc->status);
|
||||
} else {
|
||||
__clear_bit(ATH_STAT_PROMISC, sc->status);
|
||||
}
|
||||
}
|
||||
|
||||
+ if (test_bit(ATH_STAT_PROMISC, sc->status))
|
||||
+ rfilt |= AR5K_RX_FILTER_PROM;
|
||||
+
|
||||
/* Note, AR5K_RX_FILTER_MCAST is already enabled */
|
||||
if (*new_flags & FIF_ALLMULTI) {
|
||||
mfilt[0] = ~0;
|
||||
|
|
@ -28,7 +28,10 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI}"
|
|||
|
||||
pkg_setup() {
|
||||
use openfile_log && UNIPATCH_LIST="${UNIPATCH_LIST} ${FILESDIR}/openfile_log.patch"
|
||||
epatch "${FILESDIR}"/0001-ath5k-retain-promiscuous-setting.patch
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/4001-ath5k-retain-promiscuous-setting.patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue