mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 20:43:38 +02:00
pentoo-sources: drop 6.1.65 and stale patch
This commit is contained in:
parent
09da867543
commit
212e4f7ad1
4 changed files with 0 additions and 23357 deletions
|
|
@ -1,120 +0,0 @@
|
|||
diff -urN linux-2.6.36-gentoo.orig/drivers/net/wireless/ipw2x00/ipw2200.c linux-2.6.36-gentoo/drivers/net/wireless/ipw2x00/ipw2200.c
|
||||
--- linux-2.6.36-gentoo.orig/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2010-10-21 04:30:22.000000000 +0800
|
||||
+++ linux-2.6.36-gentoo/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2010-12-08 22:22:41.937999976 +0800
|
||||
@@ -216,6 +216,7 @@
|
||||
static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
|
||||
int len, int sync);
|
||||
|
||||
+static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb, int pri);
|
||||
static void ipw_tx_queue_free(struct ipw_priv *);
|
||||
|
||||
static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *);
|
||||
@@ -1911,6 +1912,63 @@
|
||||
static DEVICE_ATTR(net_stats, S_IWUSR | S_IRUGO,
|
||||
show_net_stats, store_net_stats);
|
||||
|
||||
+/* SYSFS INJECT */
|
||||
+static ssize_t store_inject(struct device *d,
|
||||
+ struct device_attribute *attr,
|
||||
+ const char *buf, size_t count)
|
||||
+{
|
||||
+ struct ipw_priv *priv = dev_get_drvdata(d);
|
||||
+ struct libipw_device *ieee = priv->ieee;
|
||||
+ struct libipw_txb *txb;
|
||||
+ struct sk_buff *skb_frag;
|
||||
+ unsigned char *newbuf;
|
||||
+ unsigned long flags;
|
||||
+
|
||||
+ // should test (ieee->is_queue_full)
|
||||
+
|
||||
+ // Fw only accepts data, so avoid accidental fw errors.
|
||||
+ if ( (buf[0]&0x0c) != '\x08') {
|
||||
+ //printk("ipw2200: inject: discarding non-data frame (type=%02X)\n",(int)(unsigned char)buf[0]);
|
||||
+ return count;
|
||||
+ }
|
||||
+
|
||||
+ if (count>1500) {
|
||||
+ count=1500;
|
||||
+ printk("ipw2200: inject: cutting down frame to 1500 bytes\n");
|
||||
+ }
|
||||
+
|
||||
+ spin_lock_irqsave(&priv->lock, flags);
|
||||
+
|
||||
+ // Create a txb with one skb
|
||||
+ txb = kmalloc(sizeof(struct libipw_txb) + sizeof(u8 *), GFP_ATOMIC);
|
||||
+ if (!txb)
|
||||
+ goto nosepuede;
|
||||
+ txb->nr_frags=1;
|
||||
+ txb->frag_size = ieee->tx_headroom;
|
||||
+ txb->fragments[0]=__dev_alloc_skb(count + ieee->tx_headroom, GFP_ATOMIC);
|
||||
+ if (!txb->fragments[0]) {
|
||||
+ kfree(txb);
|
||||
+ goto nosepuede;
|
||||
+ }
|
||||
+ skb_reserve(txb->fragments[0], ieee->tx_headroom);
|
||||
+ txb->encrypted=0;
|
||||
+ txb->payload_size=count;
|
||||
+ skb_frag = txb->fragments[0];
|
||||
+ newbuf=skb_put(skb_frag, count);
|
||||
+
|
||||
+ // copy data into txb->skb and send it
|
||||
+ memcpy(newbuf, buf, count);
|
||||
+
|
||||
+ ipw_tx_skb(priv, txb, 0);
|
||||
+
|
||||
+nosepuede:
|
||||
+ spin_unlock_irqrestore(&priv->lock, flags);
|
||||
+ return count;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static DEVICE_ATTR(inject, S_IWUSR, NULL, store_inject);
|
||||
+
|
||||
static ssize_t show_channels(struct device *d,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
@@ -10214,7 +10272,6 @@
|
||||
modify to send one tfd per fragment instead of using chunking. otherwise
|
||||
we need to heavily modify the libipw_skb_to_txb.
|
||||
*/
|
||||
-
|
||||
static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb,
|
||||
int pri)
|
||||
{
|
||||
@@ -10544,6 +10601,12 @@
|
||||
mutex_lock(&priv->mutex);
|
||||
priv->config |= CFG_CUSTOM_MAC;
|
||||
memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
|
||||
+
|
||||
+#ifdef CONFIG_IPW2200_PROMISCUOUS
|
||||
+ if (rtap_iface)
|
||||
+ memcpy(priv->prom_net_dev->dev_addr, addr->sa_data, ETH_ALEN);
|
||||
+#endif
|
||||
+
|
||||
printk(KERN_INFO "%s: Setting MAC to %pM\n",
|
||||
priv->net_dev->name, priv->mac_addr);
|
||||
schedule_work(&priv->adapter_restart);
|
||||
@@ -11597,6 +11660,7 @@
|
||||
#ifdef CONFIG_IPW2200_PROMISCUOUS
|
||||
&dev_attr_rtap_iface.attr,
|
||||
&dev_attr_rtap_filter.attr,
|
||||
+ &dev_attr_inject.attr,
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
diff -urN linux-2.6.36-gentoo.orig/drivers/net/wireless/ipw2x00/ipw2200.h linux-2.6.36-gentoo/drivers/net/wireless/ipw2x00/ipw2200.h
|
||||
--- linux-2.6.36-gentoo.orig/drivers/net/wireless/intel/ipw2x00/ipw2200.h 2010-10-21 04:30:22.000000000 +0800
|
||||
+++ linux-2.6.36-gentoo/drivers/net/wireless/intel/ipw2x00/ipw2200.h 2010-12-08 22:20:01.561000000 +0800
|
||||
@@ -2014,4 +2014,12 @@
|
||||
|
||||
#define IPW_MAX_CONFIG_RETRIES 10
|
||||
|
||||
+/*
|
||||
+ * Hhack to get code compiling on new kernels, the define below
|
||||
+ * seem to be removed from the linux headers.
|
||||
+ */
|
||||
+#ifndef MAC_ARG
|
||||
+#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
|
||||
+#endif
|
||||
+
|
||||
#endif /* __ipw2200_h__ */
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,48 +0,0 @@
|
|||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras experimental"
|
||||
K_GENPATCHES_VER="73"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="amd64 arm arm64 x86"
|
||||
HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
|
||||
IUSE="experimental +lts"
|
||||
|
||||
DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
|
||||
|
||||
src_unpack() {
|
||||
#default
|
||||
kernel-2_src_unpack
|
||||
#penpatches
|
||||
eapply -s "${FILESDIR}/4004_zd1211rw-inject+dbi-fix-4.7ish.patch"
|
||||
eapply -s "${FILESDIR}/4400_logo_larry_the_cow.patch"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
kernel-2_src_install
|
||||
insinto /usr/share/${PN}
|
||||
if use amd64; then
|
||||
doins "${FILESDIR}"/config-amd64-${PVR}
|
||||
elif use x86; then
|
||||
doins "${FILESDIR}"/config-x86-${PVR}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
ewarn "The official pentoo kernel config is now installed with the kernel in /usr/share/pentoo-sources"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kernel-2_pkg_postrm
|
||||
}
|
||||
Loading…
Reference in a new issue