aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [IPV4] devinet: inetdev_init out label moved after RCU assignmentJarek Poplawski2007-01-09
| | | | | | | | | inetdev_init out label moved after RCU assignment (final suggestion by Herbert Xu) Signed-off-by: Jarek Poplawski <jarkao2@o2.pl> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* [INET]: style updates for the inet_sock->is_icsk assignment fixPaul Moore2007-01-09
| | | | | | | | | A quick patch to change the inet_sock->is_icsk assignment to better fit with existing kernel coding style. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [SCTP]: Fix err_hdr assignment in sctp_init_cause.Vlad Yasevich2007-01-09
| | | | | | | | The subh->err_hdr should point to the error header, not the data. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT valuePatrick McHardy2007-01-09
| | | | | | | | IP_CT_TCP_FLAG_CLOSE_INIT is a flag and should have a value of 0x4 instead of 0x3, which is IP_CT_TCP_FLAG_WINDOW_SCALE | IP_CT_TCP_FLAG_SACK_PERM. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: nf_nat: fix hanging connections when loading the NAT modulePatrick McHardy2007-01-09
| | | | | | | | | | | | When loading the NAT module, existing connection tracking entries don't have room for NAT information allocated and packets are dropped, causing hanging connections. They really should be entered into the NAT table as NULL mappings, but the current allocation scheme doesn't allow this. For now simply accept those packets to avoid the hanging connections. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: arp_tables: fix userspace compilationBart De Schuymer2007-01-09
| | | | | | | | | The included patch translates arpt_counters to xt_counters, making userspace arptables compile against recent kernels. Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragmentsPatrick McHardy2007-01-09
| | | | | | | | | | | When IPv6 connection tracking splits up a defragmented packet into its original fragments, the packets are taken from a list and are passed to the network stack with skb->next still set. This causes dev_hard_start_xmit to treat them as GSO fragments, resulting in a use after free when connection tracking handles the next fragment. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2007-01-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] version 1.0.14rc1 [ALSA] usbaudio - Fix kobject_add() error at reconnection [ALSA] usb: usbmixer error path fix [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags [ALSA] hda-codec - Fix NULL dereference in generic hda code [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9 [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors [ALSA] Fix potential NULL pointer dereference in echoaudio midi [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c
| * [ALSA] version 1.0.14rc1Jaroslav Kysela2007-01-09
| | | | | | | | Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] usbaudio - Fix kobject_add() error at reconnectionTakashi Iwai2007-01-09
| | | | | | | | | | | | | | | | | | | | Fixed the error from kobject_add() at reconnection the usb audio device. This happens when an app keeps opening a device while the device is replugged, due to the confliction of the internal bookkept index and the really empty slot. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] usb: usbmixer error path fixMariusz Kozlowski2007-01-09
| | | | | | | | | | | | | | | | | | Without the patch below namelist[0] will not be freed in case of kmalloc error. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] _snd_cmipci_uswitch_put doesn't set zero flagsTimofei V. Bondarenko2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playing with spdif output on cmipci i've noticed the SPDO5V option does not change appropriate bits the register. The _snd_cmipci_uswitch_put checks the change in flags in wrong way. If 'active' state of an option corresponds to a _zero_ bits in a hw register then function fails. The SPDO5V is the sample. In the most cases 'active' state of option is set through an non-zerio bits in a register. This case works fine. The fix attached. Unfortunately i was unable to change spdif output voltage anyway. Although the register changes right at least. From: Timofei V. Bondarenko <tim@ipi.ac.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] hda-codec - Fix NULL dereference in generic hda codeTakashi Iwai2007-01-09
| | | | | | | | | | | | | | Fix NULL dereference in hda_generic.c. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9Jason Gaston2007-01-09
| | | | | | | | | | | | | | | | This patch adds the Intel ICH9 HD Audio controller DID's for ALSA. Signed-off-by: Jason Gaston <jason.d.gaston@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] usb-audio: work around wrong frequency in CM6501 descriptorsClemens Ladisch2007-01-09
| | | | | | | | | | | | | | | | The C-Media CM6501 chip's descriptors say that altsetting 5 supports 48 kHz, but it actually plays at 96 kHz. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] Fix potential NULL pointer dereference in echoaudio midiGiuliano Pochini2007-01-09
| | | | | | | | | | | | | | | | Fix races between the timer handler and the close function. Signed-off-by: Giuliano Pochini <pochini@shiny.it> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.cPeer Chen2007-01-09
| | | | | | | | | | | | | | | | Add the support for HD audio controllers of MCP51,MCP55,MCP61,MCP65 & MCP67. Signed-off-by: Peer Chen <pchen@nvidia.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2007-01-09
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: Fix iov_len calculation in tcp_v4_send_ack(). [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation [TG3]: Add PHY workaround for 5755M. [BNX2]: Update version and reldate. [BNX2]: Fix bug in bnx2_nvram_write(). [BNX2]: Fix 5709 Serdes detection. [BNX2]: Don't apply CRC PHY workaround to 5709. NetLabel: correct CIPSO tag handling when adding new DOI definitions NetLabel: correct locking in selinux_netlbl_socket_setsid() [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops [Bluetooth] Correct SCO buffer for Broadcom based HP laptops [Bluetooth] Correct SCO buffer size for another ThinkPad laptop [Bluetooth] Handle device registration failures [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg() [Bluetooth] More checks if DLC is still attached to the TTY [Bluetooth] Add packet size checks for CAPI messages [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines [INET]: Fix incorrect "inet_sock->is_icsk" assignment.
| * | [TCP]: Fix iov_len calculation in tcp_v4_send_ack().Craig Schlenter2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the ftp stalls present in the current kernels. All credit goes to Komuro <komurojun-mbn@nifty.com> for tracking this down. The patch is untested but it looks *cough* obviously correct. Signed-off-by: Craig Schlenter <craig@codefountain.com> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectationPatrick McHardy2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | ->helper is uninitialized in the expectation registered by the netbios_ns helper and it later copied to the expected connection, which causes invalid memory dereferences when trying to call the helper. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Add PHY workaround for 5755M.Michael Chan2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some PHY trim values need to be fine-tuned on 5755M to be IEEE-compliant. Update version to 3.72. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Update version and reldate.Michael Chan2007-01-09
| | | | | | | | | | | | | | | | | | | | | Update version to 1.5.3. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Fix bug in bnx2_nvram_write().Michael Chan2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was a bogus pointer being passed to kfree(). The pointer was incremented in the write loop and then passed to kfree(). The fix is to use align_buf to save the original address. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Fix 5709 Serdes detection.Michael Chan2007-01-09
| | | | | | | | | | | | | | | | | | | | | 5709 has a new register to detect copper/fiber PHYs. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Don't apply CRC PHY workaround to 5709.Michael Chan2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | The workaround is only needed on 5706/5708 and cannot be applied on 5709. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | NetLabel: correct CIPSO tag handling when adding new DOI definitionsPaul Moore2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current netlbl_cipsov4_add_common() function has two problems which are fixed with this patch. The first is an off-by-one bug where it is possibile to overflow the doi_def->tags[] array. The second is a bug where the same doi_def->tags[] array was not always fully initialized, which caused sporadic failures. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: James Morris <jmorris@namei.org>
| * | NetLabel: correct locking in selinux_netlbl_socket_setsid()Paul Moore2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | The spinlock protecting the update of the "sksec->nlbl_state" variable is not currently softirq safe which can lead to problems. This patch fixes this by changing the spin_{un}lock() functions into spin_{un}lock_bh() functions. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: James Morris <jmorris@namei.org>
| * | [Bluetooth] Correct SCO buffer for Broadcom based Dell laptopsMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | The SCO buffer size values on Dell laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] Correct SCO buffer for Broadcom based HP laptopsMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | The SCO buffer size values on HP laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] Correct SCO buffer size for another ThinkPad laptopMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | The ThinkPad R60E uses a Broadcom based Bluetooth chip and even this version needs the quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] Handle device registration failuresMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | In the case the device registration for a new Bluetooth low-level connection fails there is no need to unregister it when the temporary data structure has been removed. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg()Marcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | When calling send() with a zero length parameter on a RFCOMM socket it returns a positive value. In this rare case the variable err is used uninitialized and unfortunately its value is returned. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] More checks if DLC is still attached to the TTYMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | If the DLC device is no longer attached to the TTY device, then return errors or default values for various callbacks of the TTY layer. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [Bluetooth] Add packet size checks for CAPI messagesMarcel Holtmann2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | With malformed packets it might be possible to overwrite internal CMTP and CAPI data structures. This patch adds additional length checks to prevent these kinds of remote attacks. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| * | [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlinesAndrew Hendry2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | Trivial. Newlines missing on the SOCK_DEBUG's for X.25 facility negotiation. Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [INET]: Fix incorrect "inet_sock->is_icsk" assignment.Paul Moore2007-01-09
| |/ | | | | | | | | | | | | | | | | | | | | The inet_create() and inet6_create() functions incorrectly set the inet_sock->is_icsk field. Both functions assume that the is_icsk field is large enough to hold at least a INET_PROTOSW_ICSK value when it is actually only a single bit. This patch corrects the assignment by doing a boolean comparison whose result will safely fit into a single bit field. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'upstream-linus' of ↵Linus Torvalds2007-01-09
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: pcnet_cs : add new id chelsio: error path fix s390: iucv Kconfig help description changes s390: qeth driver fixes: atomic context fixups s390: qeth driver fixes: packet socket s390: qeth driver fixes: VLAN hdr, perf stats forcedeth: sideband management fix Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" qeth: fix uaccess handling and get rid of unused variable qla3xxx: Add delay to NVRAM register access. qla3xxx: Remove NETIF_F_LLTX from driver features. ixgb: Write RA register high word first, increment version ixgb: Maybe stop TX if not enough free descriptors ixgb: Fix early TSO completion [PATCH] ipw2100: Fix dropping fragmented small packet problem [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region)
| * | pcnet_cs : add new idKomuro2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | pcnet_cs: add new id. corega K.K. (CG-LAPCCTXD) Logitec LPM-LN10TE Signed-off-by: Komuro <komurojun-mbn@nifty.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | chelsio: error path fixStephen Hemminger2007-01-09
| | | | | | | | | | | | | | | | | | | | | Fix handling of allocation failure. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | s390: iucv Kconfig help description changesFrank Pavlic2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [PATCH 4/5] s390: iucv Kconfig help description changes From: Ursula Braun <braunu@de.ibm.com> remove text from help description which does not apply anymore for 2.6 kernel series. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | s390: qeth driver fixes: atomic context fixupsFrank Blaschka2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - qeth device functions were not callable in atomic context due to usage of wait_event_xxx operations in qeth. "schedule while atomic" message appeared and kernel dumped when removing slave from bond device. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | s390: qeth driver fixes: packet socketFrank Blaschka2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - packet socket support is not complete. Recvfrom a packet socket does not fill the sockaddr_ll structure. device function hard_header_parse is not implemented. For layer 2 mode and layer 3 mode with fake_ll turned on, we have the information to fill sockaddr_ll. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | s390: qeth driver fixes: VLAN hdr, perf statsFrank Blaschka2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Ursula Braun <braunu@de.ibm.com> - VLAN header reordering did not work on packets received through qeth interface in layer 2 mode. This caused dhcpcd not to work with VLAN devices. - set qeth performance statistics initally inactive Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | forcedeth: sideband management fixAyaz Abdulla2007-01-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains a fix that implements proper communication with the sideband management unit. Also, it makes sure that the speed is correctly set for gigabit phys in the case where sideband mgmt unit initialized the phy. Refer to bug #7684 for more details. Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging"Jeff Garzik2007-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72f3ab7462f4e153d1e8ac78e379716ad71d6923, which was superceded by commit 683a2aa339f607c8a422835161ceab68b2a5a18a ("e1000: Do not truncate TSO TCP header with 82544 workaround"), which fixed the real problem. Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | qeth: fix uaccess handling and get rid of unused variableHeiko Carstens2007-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch] qeth: fix uaccess handling and get rid of unused variable drivers/s390/net/qeth_main.c: In function `qeth_process_inbound_buffer': drivers/s390/net/qeth_main.c:2563: warning: unused variable `vlan_addr' include/asm/uaccess.h: In function `qeth_do_ioctl': drivers/s390/net/qeth_main.c:4847: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4849: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4996: warning: ignoring return value of `copy_to_user' Cc: Frank Pavlic <fpavlic@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Merge branch 'upstream-fixes' of ↵Jeff Garzik2007-01-07
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
| | * | [PATCH] ipw2100: Fix dropping fragmented small packet problemZhu Yi2007-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rx_data.header struct is ieee80211_hdr_4addr. If a wireless frame uses ieee80211_hdr_3addr header and is less than 6 bytes, it will be discarded. This is not likely going to happen for normal packets (since there is TCP, IP headers). But if fragmentation is used, there will be such small trailing packets. And they will be lost for ever. Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region)Zhu Yi2007-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The WLAN_GET_SEQ_SEQ(seq) macro in ieee80211 is selecting the wrong region. Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | qla3xxx: Add delay to NVRAM register access.Ron Mercer2007-01-07
| | | | | | | | | | | | | | | | | | | | | | | | When accessing the 93LC86 serial prom the clock high and low times must be at least 250ns each. We have seen on some systems where the access times were much lower casing bit errors. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>