Skip to content
Browse files

Initial patchset for 2.6.22

  • Loading branch information...
1 parent 031a273 commit 7cfd198d79802a7871cfb0733c7608b54bed5806 @mika mika committed Jul 9, 2007
View
77 2.6.22/x86/4200_ipw2200-1.1.4-inject.patch
@@ -0,0 +1,77 @@
+--- a/drivers/net/wireless/ipw2200.c 2007-02-04 19:44:54.000000000 +0100
++++ b/drivers/net/wireless/ipw2200.c 2007-05-03 19:01:14.272961391 +0200
+@@ -1847,6 +1847,66 @@
+ static DEVICE_ATTR(net_stats, S_IWUSR | S_IRUGO,
+ show_net_stats, store_net_stats);
+
++static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, int pri);
++
++/* SYSFS INJECT */
++static ssize_t store_inject(struct device *d,
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
++ struct device_attribute *attr,
++#endif
++ const char *buf, size_t count)
++{
++ struct ipw_priv *priv = (struct ipw_priv *)d->driver_data;
++ struct ieee80211_device *ieee = priv->ieee;
++ struct ieee80211_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 ieee80211_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 void notify_wx_assoc_event(struct ipw_priv *priv)
+ {
+ union iwreq_data wrqu;
+@@ -11386,6 +11446,7 @@
+ #ifdef CONFIG_IPW2200_PROMISCUOUS
+ &dev_attr_rtap_iface.attr,
+ &dev_attr_rtap_filter.attr,
++ &dev_attr_inject.attr,
+ #endif
+ NULL
+ };
View
32 2.6.22/x86/4210_cx88-cinergy-1400-support.patch
@@ -0,0 +1,32 @@
+From: Heiko Baums <heiko@baums-on-web.de>
+Date: Sun, 21 Jan 2007 08:58:19 +0000 (-0300)
+Subject: V4L/DVB (5114): Cx88: Add support for svideo/composite input of the Terratec Cinergy ...
+X-Git-Url: http://www2.kernel.org/git/?p=linux%2Fkernel%2Fgit%2Fmchehab%2Fv4l-dvb.git;a=commitdiff_plain;h=6c12898641b46dc3f84ecc61eb1e532f12bff018
+
+V4L/DVB (5114): Cx88: Add support for svideo/composite input of the Terratec Cinergy 1400 DVB-T
+
+Adds support for the combined S-Video/Composite input of the
+Terratec Cinergy 1400 DVB-T.
+
+Signed-off-by: Heiko Baums <heiko@baums-on-web.de>
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+---
+
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index 434b78a..65e9d80 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -764,6 +764,12 @@ struct cx88_board cx88_boards[] = {
+ .input = {{
+ .type = CX88_VMUX_DVB,
+ .vmux = 0,
++ },{
++ .type = CX88_VMUX_COMPOSITE1,
++ .vmux = 2,
++ },{
++ .type = CX88_VMUX_SVIDEO,
++ .vmux = 2,
+ }},
+ .mpeg = CX88_MPEG_DVB,
+ },
View
4,387 2.6.22/x86/4300_squashfs-3.2-r2.patch
4,387 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2,972 2.6.22/x86/5001_grml_logo.patch
2,972 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
11 2.6.22/x86/5002_grml-kernelversion.patch
@@ -0,0 +1,11 @@
+--- a/Makefile 2007-07-09 23:52:52.255410865 +0200
++++ b/Makefile 2007-07-09 23:52:57.135136826 +0200
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION =
++EXTRAVERSION = -grml
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*

0 comments on commit 7cfd198

Please sign in to comment.
Something went wrong with that request. Please try again.