From fd95497c135dfcd52adbc14608503e72c5d475f9 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Thu, 6 Sep 2012 13:36:28 +0200 Subject: [PATCH 1/4] hdhomerun: bump addon version for new kernel --- packages/addons/driver/hdhomerun/changelog.txt | 3 +++ packages/addons/driver/hdhomerun/meta | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt index 47d1ad8101..fc64fd9c6d 100644 --- a/packages/addons/driver/hdhomerun/changelog.txt +++ b/packages/addons/driver/hdhomerun/changelog.txt @@ -1,3 +1,6 @@ +2.1.3 +- bump addon version for new kernel + 2.1.2 - dvbhdhomerun upgraded to 0.0.10 diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/meta index bc9d4b032c..0574213db7 100644 --- a/packages/addons/driver/hdhomerun/meta +++ b/packages/addons/driver/hdhomerun/meta @@ -20,7 +20,7 @@ PKG_NAME="hdhomerun" PKG_VERSION="2.0" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" From fe6aceac2d4d86c3e5f1bd70b14de55cb16f2c72 Mon Sep 17 00:00:00 2001 From: Jan Hill Date: Sun, 2 Sep 2012 17:46:50 +0200 Subject: [PATCH 2/4] Add lirc_ttusbir support. --- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic_OSS/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/RPi/linux/linux.arm.conf | 2 +- projects/RPi/linux/linux.arm.conf.3.1.10 | 2 +- projects/Ultra/linux/linux.x86_64.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index f67cd88d20..903a1742cd 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -2530,7 +2530,7 @@ CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 6310e33d47..4c7255a0d2 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -2855,7 +2855,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACERHDF is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 3a8b2909ff..4d31e8cb35 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -2795,7 +2795,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACERHDF is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 5871796ae0..940d64c989 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -3017,7 +3017,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index a6a72c4dad..ccb34cee08 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -3019,7 +3019,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WMI is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 9324c44383..6c1f81e21d 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -2855,7 +2855,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c3f5846cc7..b83a045cfa 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2782,7 +2782,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index da5197362b..9c383af99a 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -2916,7 +2916,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index e118cc095e..0297e02b13 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2844,7 +2844,7 @@ CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 16ff62b869..9930f7a4d1 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1766,7 +1766,7 @@ CONFIG_LIRC_IGORPLUGUSB=y # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set CONFIG_CLKDEV_LOOKUP=y diff --git a/projects/RPi/linux/linux.arm.conf.3.1.10 b/projects/RPi/linux/linux.arm.conf.3.1.10 index 8c89f48729..1a5bd7f1e4 100644 --- a/projects/RPi/linux/linux.arm.conf.3.1.10 +++ b/projects/RPi/linux/linux.arm.conf.3.1.10 @@ -1640,7 +1640,7 @@ CONFIG_LIRC_IGORPLUGUSB=y # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_ATH6K_LEGACY is not set # CONFIG_USB_ENESTORAGE is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index c71ed5116f..3edb4c0ee7 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -2609,7 +2609,7 @@ CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_TTUSBIR is not set +CONFIG_LIRC_TTUSBIR=m # CONFIG_LIRC_ZILOG is not set # CONFIG_X86_PLATFORM_DEVICES is not set From 7636057885c24bdc7f4e101e1fa4420c4040bda7 Mon Sep 17 00:00:00 2001 From: Jan Hill Date: Sun, 2 Sep 2012 17:45:04 +0200 Subject: [PATCH 3/4] linux: add -214-hdtv-hvr930c.patch [media] em28xx: Reworked probe code to get rid of some hacks Reworked device probing to get rid of hacks to guess the maximum size of dvb iso transfer packets. The new code also selects the first alternate config which supports the largest possible iso transfers for dvb. ==== This patch ist take from kernel.org without any changes. It improves the handling of hd-channels exactly the dvb iso transfer packages. It works fine fpr my HVR930C --- .../linux-3.2.28-214-hdtv-hvr930c.patch | 389 ++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch diff --git a/packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch b/packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch new file mode 100644 index 0000000000..e84c2495ee --- /dev/null +++ b/packages/linux/patches/linux-3.2.28-214-hdtv-hvr930c.patch @@ -0,0 +1,389 @@ +From 8ab3362665a699bd54fc489ff7fb6372678b94c1 Mon Sep 17 00:00:00 2001 +From: Holger Nelson +Date: Wed, 28 Dec 2011 18:55:41 -0300 +Subject: [PATCH] [media] em28xx: Reworked probe code to get rid of some hacks + +Reworked device probing to get rid of hacks to guess the maximum size of +dvb iso transfer packets. The new code also selects the first alternate +config which supports the largest possible iso transfers for dvb. + +[mchehab@redhat.com: Fix a few checkpatch.pl CodingStyle compliants] +Signed-off-by: Holger Nelson +Signed-off-by: Mauro Carvalho Chehab +--- + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 148 ++++++++++++++--------------- + drivers/media/video/em28xx/em28xx-core.c | 59 +----------- + drivers/media/video/em28xx/em28xx-dvb.c | 4 +- + drivers/media/video/em28xx/em28xx-reg.h | 5 + + drivers/media/video/em28xx/em28xx.h | 2 + + 6 files changed, 84 insertions(+), 136 deletions(-) + +diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c +index cff0768..e2a7b77 100644 +--- a/drivers/media/video/em28xx/em28xx-audio.c ++++ b/drivers/media/video/em28xx/em28xx-audio.c +@@ -193,7 +193,7 @@ static int em28xx_init_audio_isoc(struct em28xx *dev) + + urb->dev = dev->udev; + urb->context = dev; +- urb->pipe = usb_rcvisocpipe(dev->udev, 0x83); ++ urb->pipe = usb_rcvisocpipe(dev->udev, EM28XX_EP_AUDIO); + urb->transfer_flags = URB_ISO_ASAP; + urb->transfer_buffer = dev->adev.transfer_buffer[i]; + urb->interval = 1; +diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c +index b95e661..0adaf84 100644 +--- a/drivers/media/video/em28xx/em28xx-cards.c ++++ b/drivers/media/video/em28xx/em28xx-cards.c +@@ -3111,12 +3111,11 @@ unregister_dev: + static int em28xx_usb_probe(struct usb_interface *interface, + const struct usb_device_id *id) + { +- const struct usb_endpoint_descriptor *endpoint; + struct usb_device *udev; + struct em28xx *dev = NULL; + int retval; +- bool is_audio_only = false, has_audio = false; +- int i, nr, isoc_pipe; ++ bool has_audio = false, has_video = false, has_dvb = false; ++ int i, nr; + const int ifnum = interface->altsetting[0].desc.bInterfaceNumber; + char *speed; + char descr[255] = ""; +@@ -3148,54 +3147,65 @@ static int em28xx_usb_probe(struct usb_interface *interface, + goto err; + } + ++ /* allocate memory for our device state and initialize it */ ++ dev = kzalloc(sizeof(*dev), GFP_KERNEL); ++ if (dev == NULL) { ++ em28xx_err(DRIVER_NAME ": out of memory!\n"); ++ retval = -ENOMEM; ++ goto err; ++ } ++ ++ /* compute alternate max packet sizes */ ++ dev->alt_max_pkt_size = kmalloc(sizeof(dev->alt_max_pkt_size[0]) * ++ interface->num_altsetting, GFP_KERNEL); ++ if (dev->alt_max_pkt_size == NULL) { ++ em28xx_errdev("out of memory!\n"); ++ kfree(dev); ++ retval = -ENOMEM; ++ goto err; ++ } ++ + /* Get endpoints */ + for (i = 0; i < interface->num_altsetting; i++) { + int ep; + + for (ep = 0; ep < interface->altsetting[i].desc.bNumEndpoints; ep++) { +- struct usb_host_endpoint *e; +- e = &interface->altsetting[i].endpoint[ep]; +- +- if (e->desc.bEndpointAddress == 0x83) +- has_audio = true; ++ const struct usb_endpoint_descriptor *e; ++ int sizedescr, size; ++ ++ e = &interface->altsetting[i].endpoint[ep].desc; ++ ++ sizedescr = le16_to_cpu(e->wMaxPacketSize); ++ size = sizedescr & 0x7ff; ++ ++ if (udev->speed == USB_SPEED_HIGH) ++ size = size * hb_mult(sizedescr); ++ ++ if (usb_endpoint_xfer_isoc(e) && ++ usb_endpoint_dir_in(e)) { ++ switch (e->bEndpointAddress) { ++ case EM28XX_EP_AUDIO: ++ has_audio = true; ++ break; ++ case EM28XX_EP_ANALOG: ++ has_video = true; ++ dev->alt_max_pkt_size[i] = size; ++ break; ++ case EM28XX_EP_DIGITAL: ++ has_dvb = true; ++ if (size > dev->dvb_max_pkt_size) { ++ dev->dvb_max_pkt_size = size; ++ dev->dvb_alt = i; ++ } ++ break; ++ } ++ } + } + } + +- endpoint = &interface->cur_altsetting->endpoint[0].desc; +- +- /* check if the device has the iso in endpoint at the correct place */ +- if (usb_endpoint_xfer_isoc(endpoint) +- && +- (interface->altsetting[1].endpoint[0].desc.wMaxPacketSize == 940)) { +- /* It's a newer em2874/em2875 device */ +- isoc_pipe = 0; +- } else { +- int check_interface = 1; +- isoc_pipe = 1; +- endpoint = &interface->cur_altsetting->endpoint[1].desc; +- if (!usb_endpoint_xfer_isoc(endpoint)) +- check_interface = 0; +- +- if (usb_endpoint_dir_out(endpoint)) +- check_interface = 0; +- +- if (!check_interface) { +- if (has_audio) { +- is_audio_only = true; +- } else { +- em28xx_err(DRIVER_NAME " video device (%04x:%04x): " +- "interface %i, class %i found.\n", +- le16_to_cpu(udev->descriptor.idVendor), +- le16_to_cpu(udev->descriptor.idProduct), +- ifnum, +- interface->altsetting[0].desc.bInterfaceClass); +- em28xx_err(DRIVER_NAME " This is an anciliary " +- "interface not used by the driver\n"); +- +- retval = -ENODEV; +- goto err; +- } +- } ++ if (!(has_audio || has_video || has_dvb)) { ++ retval = -ENODEV; ++ goto err_free; + } + + switch (udev->speed) { +@@ -3221,6 +3231,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + strlcat(descr, " ", sizeof(descr)); + strlcat(descr, udev->product, sizeof(descr)); + } ++ + if (*descr) + strlcat(descr, " ", sizeof(descr)); + +@@ -3237,6 +3248,14 @@ static int em28xx_usb_probe(struct usb_interface *interface, + printk(KERN_INFO DRIVER_NAME + ": Audio Vendor Class interface %i found\n", + ifnum); ++ if (has_video) ++ printk(KERN_INFO DRIVER_NAME ++ ": Video interface %i found\n", ++ ifnum); ++ if (has_dvb) ++ printk(KERN_INFO DRIVER_NAME ++ ": DVB interface %i found\n", ++ ifnum); + + /* + * Make sure we have 480 Mbps of bandwidth, otherwise things like +@@ -3248,22 +3267,14 @@ static int em28xx_usb_probe(struct usb_interface *interface, + printk(DRIVER_NAME ": Device must be connected to a high-speed" + " USB 2.0 port.\n"); + retval = -ENODEV; +- goto err; +- } +- +- /* allocate memory for our device state and initialize it */ +- dev = kzalloc(sizeof(*dev), GFP_KERNEL); +- if (dev == NULL) { +- em28xx_err(DRIVER_NAME ": out of memory!\n"); +- retval = -ENOMEM; +- goto err; ++ goto err_free; + } + + snprintf(dev->name, sizeof(dev->name), "em28xx #%d", nr); + dev->devno = nr; + dev->model = id->driver_info; + dev->alt = -1; +- dev->is_audio_only = is_audio_only; ++ dev->is_audio_only = has_audio && !(has_video || has_dvb); + dev->has_alsa_audio = has_audio; + dev->audio_ifnum = ifnum; + +@@ -3276,26 +3287,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + } + } + +- /* compute alternate max packet sizes */ + dev->num_alt = interface->num_altsetting; +- dev->alt_max_pkt_size = kmalloc(32 * dev->num_alt, GFP_KERNEL); +- +- if (dev->alt_max_pkt_size == NULL) { +- em28xx_errdev("out of memory!\n"); +- kfree(dev); +- retval = -ENOMEM; +- goto err; +- } +- +- for (i = 0; i < dev->num_alt ; i++) { +- u16 tmp = le16_to_cpu(interface->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize); +- unsigned int size = tmp & 0x7ff; +- +- if (udev->speed == USB_SPEED_HIGH) +- size = size * hb_mult(tmp); +- +- dev->alt_max_pkt_size[i] = size; +- } + + if ((card[nr] >= 0) && (card[nr] < em28xx_bcount)) + dev->model = card[nr]; +@@ -3308,10 +3300,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + mutex_lock(&dev->lock); + retval = em28xx_init_dev(&dev, udev, interface, nr); + if (retval) { +- mutex_unlock(&dev->lock); +- kfree(dev->alt_max_pkt_size); +- kfree(dev); +- goto err; ++ goto unlock_and_free; + } + + request_modules(dev); +@@ -3330,6 +3319,13 @@ static int em28xx_usb_probe(struct usb_interface *interface, + + return 0; + ++unlock_and_free: ++ mutex_unlock(&dev->lock); ++ ++err_free: ++ kfree(dev->alt_max_pkt_size); ++ kfree(dev); ++ + err: + clear_bit(nr, &em28xx_devused); + +diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c +index 2982a06..0aacc96 100644 +--- a/drivers/media/video/em28xx/em28xx-core.c ++++ b/drivers/media/video/em28xx/em28xx-core.c +@@ -1070,7 +1070,8 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, + should also be using 'desc.bInterval' + */ + pipe = usb_rcvisocpipe(dev->udev, +- dev->mode == EM28XX_ANALOG_MODE ? 0x82 : 0x84); ++ dev->mode == EM28XX_ANALOG_MODE ? ++ EM28XX_EP_ANALOG : EM28XX_EP_DIGITAL); + + usb_fill_int_urb(urb, dev->udev, pipe, + dev->isoc_ctl.transfer_buffer[i], sb_size, +@@ -1108,62 +1109,6 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, + } + EXPORT_SYMBOL_GPL(em28xx_init_isoc); + +-/* Determine the packet size for the DVB stream for the given device +- (underlying value programmed into the eeprom) */ +-int em28xx_isoc_dvb_max_packetsize(struct em28xx *dev) +-{ +- unsigned int chip_cfg2; +- unsigned int packet_size; +- +- switch (dev->chip_id) { +- case CHIP_ID_EM2710: +- case CHIP_ID_EM2750: +- case CHIP_ID_EM2800: +- case CHIP_ID_EM2820: +- case CHIP_ID_EM2840: +- case CHIP_ID_EM2860: +- /* No DVB support */ +- return -EINVAL; +- case CHIP_ID_EM2870: +- case CHIP_ID_EM2883: +- /* TS max packet size stored in bits 1-0 of R01 */ +- chip_cfg2 = em28xx_read_reg(dev, EM28XX_R01_CHIPCFG2); +- switch (chip_cfg2 & EM28XX_CHIPCFG2_TS_PACKETSIZE_MASK) { +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_188: +- packet_size = 188; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_376: +- packet_size = 376; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_564: +- packet_size = 564; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_752: +- packet_size = 752; +- break; +- } +- break; +- case CHIP_ID_EM2874: +- /* +- * FIXME: for now assumes 564 like it was before, but the +- * em2874 code should be added to return the proper value +- */ +- packet_size = 564; +- break; +- case CHIP_ID_EM2884: +- case CHIP_ID_EM28174: +- default: +- /* +- * FIXME: same as em2874. 564 was enough for 22 Mbit DVB-T +- * but not enough for 44 Mbit DVB-C. +- */ +- packet_size = 752; +- } +- +- return packet_size; +-} +-EXPORT_SYMBOL_GPL(em28xx_isoc_dvb_max_packetsize); +- + /* + * em28xx_wake_i2c() + * configure i2c attached devices +diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c +index ac55de9..9449423 100644 +--- a/drivers/media/video/em28xx/em28xx-dvb.c ++++ b/drivers/media/video/em28xx/em28xx-dvb.c +@@ -164,12 +164,12 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb) + struct em28xx *dev = dvb->adapter.priv; + int max_dvb_packet_size; + +- usb_set_interface(dev->udev, 0, 1); ++ usb_set_interface(dev->udev, 0, dev->dvb_alt); + rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); + if (rc < 0) + return rc; + +- max_dvb_packet_size = em28xx_isoc_dvb_max_packetsize(dev); ++ max_dvb_packet_size = dev->dvb_max_pkt_size; + if (max_dvb_packet_size < 0) + return max_dvb_packet_size; + dprintk(1, "Using %d buffers each with %d bytes\n", +diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h +index 66f7923..2f62685 100644 +--- a/drivers/media/video/em28xx/em28xx-reg.h ++++ b/drivers/media/video/em28xx/em28xx-reg.h +@@ -12,6 +12,11 @@ + #define EM_GPO_2 (1 << 2) + #define EM_GPO_3 (1 << 3) + ++/* em28xx endpoints */ ++#define EM28XX_EP_ANALOG 0x82 ++#define EM28XX_EP_AUDIO 0x83 ++#define EM28XX_EP_DIGITAL 0x84 ++ + /* em2800 registers */ + #define EM2800_R08_AUDIOSRC 0x08 + +diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h +index 2dbb12c..7c3ebe2 100644 +--- a/drivers/media/video/em28xx/em28xx.h ++++ b/drivers/media/video/em28xx/em28xx.h +@@ -598,6 +598,8 @@ struct em28xx { + int max_pkt_size; /* max packet size of isoc transaction */ + int num_alt; /* Number of alternative settings */ + unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ ++ int dvb_alt; /* alternate for DVB */ ++ unsigned int dvb_max_pkt_size; /* wMaxPacketSize for DVB */ + struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ + char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc + transfer */ +-- +1.7.6.5 + + From 7d80f298350e49b86d1a37a08e662a4bb013abd4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 7 Sep 2012 00:35:02 +0300 Subject: [PATCH 4/4] projects/*/linux/linux.*.conf: disable ipv6 support for now - closes #1170 --- projects/ATV/linux/linux.i386.conf | 35 ++-------------------- projects/Fusion/linux/linux.i386.conf | 35 ++-------------------- projects/Fusion/linux/linux.x86_64.conf | 35 ++-------------------- projects/Generic/linux/linux.i386.conf | 35 ++-------------------- projects/Generic_OSS/linux/linux.i386.conf | 35 ++-------------------- projects/ION/linux/linux.i386.conf | 35 ++-------------------- projects/ION/linux/linux.x86_64.conf | 35 ++-------------------- projects/Intel/linux/linux.i386.conf | 35 ++-------------------- projects/Intel/linux/linux.x86_64.conf | 35 ++-------------------- projects/Ultra/linux/linux.x86_64.conf | 35 ++-------------------- projects/Virtual/linux/linux.i386.conf | 35 ++-------------------- projects/Virtual/linux/linux.x86_64.conf | 35 ++-------------------- 12 files changed, 24 insertions(+), 396 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 903a1742cd..fe77317efa 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -579,7 +579,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -590,26 +590,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -652,18 +633,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 4c7255a0d2..b99b4e8e78 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -580,7 +580,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -591,26 +591,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -653,18 +634,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 4d31e8cb35..cfce13acbd 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -540,7 +540,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -551,26 +551,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -613,18 +594,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 940d64c989..6a70d78e7e 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -584,7 +584,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -595,26 +595,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -657,18 +638,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index ccb34cee08..d7f4a84c86 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -584,7 +584,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -595,26 +595,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -657,18 +638,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 6c1f81e21d..4ab4ec85f1 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -580,7 +580,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -591,26 +591,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -653,18 +634,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index b83a045cfa..4c243c98cb 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -529,7 +529,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -540,26 +540,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -602,18 +583,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 9c383af99a..c9502165ea 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -582,7 +582,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -593,26 +593,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -655,18 +636,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 0297e02b13..20337e4b7c 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -532,7 +532,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -543,26 +543,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -605,18 +586,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 3edb4c0ee7..0188c7055e 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -529,7 +529,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -540,26 +540,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -602,18 +583,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 3abf9f4cdd..101187d4c1 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -580,7 +580,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -591,26 +591,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -653,18 +634,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 1a70466798..0204b93b71 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -529,7 +529,7 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set @@ -540,26 +540,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set CONFIG_NETFILTER=y @@ -602,18 +583,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set