1. 07 May, 2010 1 commit
  2. 05 May, 2010 2 commits
  3. 04 May, 2010 3 commits
  4. 01 May, 2010 3 commits
  5. 29 Apr, 2010 4 commits
  6. 28 Apr, 2010 20 commits
    • Linus Torvalds's avatar
      1d16b0f2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 032b734d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        sfc: Change falcon_probe_board() to fail for unsupported boards
        sfc: Always close net device at the end of a disabling reset
        sfc: Wait at most 10ms for the MC to finish reading out MAC statistics
        sctp: Fix oops when sending queued ASCONF chunks
        sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set
        sctp: per_cpu variables should be in bh_disabled section
        sctp: fix potential reference of a freed pointer
        sctp: avoid irq lock inversion while call sk->sk_data_ready()
        Revert "tcp: bind() fix when many ports are bound"
        net/usb: add sierra_net.c driver
        cdc_ether: fix autosuspend for mbm devices
        bluetooth: handle l2cap_create_connless_pdu() errors
        gianfar: Wait for both RX and TX to stop
        ipheth: potential null dereferences on error path
        smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt()
        drivers/usb/net/kaweth.c: add device "Allied Telesyn AT-USB10 USB Ethernet Adapter"
        bnx2: Update version to 2.0.9.
        bnx2: Prevent "scheduling while atomic" warning with cnic, bonding and vlan.
        bnx2: Fix lost MSI-X problem on 5709 NICs.
        cxgb3: Wait longer for control packets on initialization
        ...
      032b734d
    • Ben Hutchings's avatar
      sfc: Change falcon_probe_board() to fail for unsupported boards · e41c11ee
      Ben Hutchings authored
      The driver needs specific PHY and board support code for each SFC4000
      board; there is no point trying to continue if it is missing.
      Currently unsupported boards can trigger an 'oops'.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e41c11ee
    • Ben Hutchings's avatar
      sfc: Always close net device at the end of a disabling reset · f49a4589
      Ben Hutchings authored
      This fixes a regression introduced by commit
      eb9f6744 "sfc: Implement ethtool
      reset operation".
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f49a4589
    • Ben Hutchings's avatar
      sfc: Wait at most 10ms for the MC to finish reading out MAC statistics · aabc5649
      Ben Hutchings authored
      The original code would wait indefinitely if MAC stats DMA failed.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aabc5649
    • Vlad Yasevich's avatar
      sctp: Fix oops when sending queued ASCONF chunks · c0786693
      Vlad Yasevich authored
      When we finish processing ASCONF_ACK chunk, we try to send
      the next queued ASCONF.  This action runs the sctp state
      machine recursively and it's not prepared to do so.
      
      kernel BUG at kernel/timer.c:790!
      invalid opcode: 0000 [#1] SMP
      last sysfs file: /sys/module/ipv6/initstate
      Modules linked in: sha256_generic sctp libcrc32c ipv6 dm_multipath
      uinput 8139too i2c_piix4 8139cp mii i2c_core pcspkr virtio_net joydev
      floppy virtio_blk virtio_pci [last unloaded: scsi_wait_scan]
      
      Pid: 0, comm: swapper Not tainted 2.6.34-rc4 #15 /Bochs
      EIP: 0060:[<c044a2ef>] EFLAGS: 00010286 CPU: 0
      EIP is at add_timer+0xd/0x1b
      EAX: cecbab14 EBX: 000000f0 ECX: c0957b1c EDX: 03595cf4
      ESI: cecba800 EDI: cf276f00 EBP: c0957aa0 ESP: c0957aa0
       DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
      Process swapper (pid: 0, ti=c0956000 task=c0988ba0 task.ti=c0956000)
      Stack:
       c0957ae0 d1851214 c0ab62e4 c0ab5f26 0500ffff 00000004 00000005 00000004
      <0> 00000000 d18694fd 00000004 1666b892 cecba800 cecba800 c0957b14
      00000004
      <0> c0957b94 d1851b11 ceda8b00 cecba800 cf276f00 00000001 c0957b14
      000000d0
      Call Trace:
       [<d1851214>] ? sctp_side_effects+0x607/0xdfc [sctp]
       [<d1851b11>] ? sctp_do_sm+0x108/0x159 [sctp]
       [<d1863386>] ? sctp_pname+0x0/0x1d [sctp]
       [<d1861a56>] ? sctp_primitive_ASCONF+0x36/0x3b [sctp]
       [<d185657c>] ? sctp_process_asconf_ack+0x2a4/0x2d3 [sctp]
       [<d184e35c>] ? sctp_sf_do_asconf_ack+0x1dd/0x2b4 [sctp]
       [<d1851ac1>] ? sctp_do_sm+0xb8/0x159 [sctp]
       [<d1863334>] ? sctp_cname+0x0/0x52 [sctp]
       [<d1854377>] ? sctp_assoc_bh_rcv+0xac/0xe1 [sctp]
       [<d1858f0f>] ? sctp_inq_push+0x2d/0x30 [sctp]
       [<d186329d>] ? sctp_rcv+0x797/0x82e [sctp]
      Tested-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
      Signed-off-by: default avatarYuansong Qiao <ysqiao@research.ait.ie>
      Signed-off-by: default avatarShuaijun Zhang <szhang@research.ait.ie>
      Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c0786693
    • Wei Yongjun's avatar
      sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set · a8170c35
      Wei Yongjun authored
      When calculating the INIT/INIT-ACK chunk length, we should not
      only account the length of parameters, but also the parameters
      zero padding length, such as AUTH HMACS parameter and CHUNKS
      parameter. Without the parameters zero padding length we may get
      following oops.
      
      skb_over_panic: text:ce2068d2 len:130 put:6 head:cac3fe00 data:cac3fe00 tail:0xcac3fe82 end:0xcac3fe80 dev:<NULL>
      ------------[ cut here ]------------
      kernel BUG at net/core/skbuff.c:127!
      invalid opcode: 0000 [#2] SMP
      last sysfs file: /sys/module/aes_generic/initstate
      Modules linked in: authenc ......
      
      Pid: 4102, comm: sctp_darn Tainted: G      D    2.6.34-rc2 #6
      EIP: 0060:[<c0607630>] EFLAGS: 00010282 CPU: 0
      EIP is at skb_over_panic+0x37/0x3e
      EAX: 00000078 EBX: c07c024b ECX: c07c02b9 EDX: cb607b78
      ESI: 00000000 EDI: cac3fe7a EBP: 00000002 ESP: cb607b74
       DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      Process sctp_darn (pid: 4102, ti=cb607000 task=cabdc990 task.ti=cb607000)
      Stack:
       c07c02b9 ce2068d2 00000082 00000006 cac3fe00 cac3fe00 cac3fe82 cac3fe80
      <0> c07c024b cac3fe7c cac3fe7a c0608dec ca986e80 ce2068d2 00000006 0000007a
      <0> cb8120ca ca986e80 cb812000 00000003 cb8120c4 ce208a25 cb8120ca cadd9400
      Call Trace:
       [<ce2068d2>] ? sctp_addto_chunk+0x45/0x85 [sctp]
       [<c0608dec>] ? skb_put+0x2e/0x32
       [<ce2068d2>] ? sctp_addto_chunk+0x45/0x85 [sctp]
       [<ce208a25>] ? sctp_make_init+0x279/0x28c [sctp]
       [<c0686a92>] ? apic_timer_interrupt+0x2a/0x30
       [<ce1fdc0b>] ? sctp_sf_do_prm_asoc+0x2b/0x7b [sctp]
       [<ce202823>] ? sctp_do_sm+0xa0/0x14a [sctp]
       [<ce2133b9>] ? sctp_pname+0x0/0x14 [sctp]
       [<ce211d72>] ? sctp_primitive_ASSOCIATE+0x2b/0x31 [sctp]
       [<ce20f3cf>] ? sctp_sendmsg+0x7a0/0x9eb [sctp]
       [<c064eb1e>] ? inet_sendmsg+0x3b/0x43
       [<c04244b7>] ? task_tick_fair+0x2d/0xd9
       [<c06031e1>] ? sock_sendmsg+0xa7/0xc1
       [<c0416afe>] ? smp_apic_timer_interrupt+0x6b/0x75
       [<c0425123>] ? dequeue_task_fair+0x34/0x19b
       [<c0446abb>] ? sched_clock_local+0x17/0x11e
       [<c052ea87>] ? _copy_from_user+0x2b/0x10c
       [<c060ab3a>] ? verify_iovec+0x3c/0x6a
       [<c06035ca>] ? sys_sendmsg+0x186/0x1e2
       [<c042176b>] ? __wake_up_common+0x34/0x5b
       [<c04240c2>] ? __wake_up+0x2c/0x3b
       [<c057e35c>] ? tty_wakeup+0x43/0x47
       [<c04430f2>] ? remove_wait_queue+0x16/0x24
       [<c0580c94>] ? n_tty_read+0x5b8/0x65e
       [<c042be02>] ? default_wake_function+0x0/0x8
       [<c0604e0e>] ? sys_socketcall+0x17f/0x1cd
       [<c040264c>] ? sysenter_do_call+0x12/0x22
      Code: 0f 45 de 53 ff b0 98 00 00 00 ff b0 94 ......
      EIP: [<c0607630>] skb_over_panic+0x37/0x3e SS:ESP 0068:cb607b74
      
      To reproduce:
      
      # modprobe sctp
      # echo 1 > /proc/sys/net/sctp/addip_enable
      # echo 1 > /proc/sys/net/sctp/auth_enable
      # sctp_test -H 3ffe:501:ffff:100:20c:29ff:fe4d:f37e -P 800 -l
      # sctp_darn -H 3ffe:501:ffff:100:20c:29ff:fe4d:f37e -P 900 -h 192.168.0.21 -p 800 -I -s -t
      sctp_darn ready to send...
      3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> bindx-add=192.168.0.21
      3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> bindx-add=192.168.1.21
      3ffe:501:ffff:100:20c:29ff:fe4d:f37e:900-192.168.0.21:800 Interactive mode> snd=10
      
      ------------------------------------------------------------------
      eth0 has addresses: 3ffe:501:ffff:100:20c:29ff:fe4d:f37e and 192.168.0.21
      eth1 has addresses: 192.168.1.21
      ------------------------------------------------------------------
      Reported-by: default avatarGeorge Cheimonidis <gchimon@gmail.com>
      Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
      Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a8170c35
    • Vlad Yasevich's avatar
      sctp: per_cpu variables should be in bh_disabled section · 81419d86
      Vlad Yasevich authored
      Since the change of the atomics to percpu variables, we now
      have to disable BH in process context when touching percpu variables.
      Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      81419d86
    • Vlad Yasevich's avatar
      sctp: fix potential reference of a freed pointer · 0c42749c
      Vlad Yasevich authored
      When sctp attempts to update an assocition, it removes any
      addresses that were not in the updated INITs.  However, the loop
      may attempt to refrence a transport with address after removing it.
      Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0c42749c
    • Wei Yongjun's avatar
      sctp: avoid irq lock inversion while call sk->sk_data_ready() · 561b1733
      Wei Yongjun authored
      sk->sk_data_ready() of sctp socket can be called from both BH and non-BH
      contexts, but the default sk->sk_data_ready(), sock_def_readable(), can
      not be used in this case. Therefore, we have to make a new function
      sctp_data_ready() to grab sk->sk_data_ready() with BH disabling.
      
      =========================================================
      [ INFO: possible irq lock inversion dependency detected ]
      2.6.33-rc6 #129
      ---------------------------------------------------------
      sctp_darn/1517 just changed the state of lock:
       (clock-AF_INET){++.?..}, at: [<c06aab60>] sock_def_readable+0x20/0x80
      but this lock took another, SOFTIRQ-unsafe lock in the past:
       (slock-AF_INET){+.-...}
      
      and interrupts could create inverse lock ordering between them.
      
      other info that might help us debug this:
      1 lock held by sctp_darn/1517:
       #0:  (sk_lock-AF_INET){+.+.+.}, at: [<cdfe363d>] sctp_sendmsg+0x23d/0xc00 [sctp]
      Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
      Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      561b1733
    • David S. Miller's avatar
      Revert "tcp: bind() fix when many ports are bound" · 8d238b25
      David S. Miller authored
      This reverts two commits:
      
      fda48a0d
      tcp: bind() fix when many ports are bound
      
      and a follow-on fix for it:
      
      6443bb1f
      ipv6: Fix inet6_csk_bind_conflict()
      
      It causes problems with binding listening sockets when time-wait
      sockets from a previous instance still are alive.
      
      It's too late to keep fiddling with this so late in the -rc
      series, and we'll deal with it in net-next-2.6 instead.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8d238b25
    • Bjorn Helgaas's avatar
      x86/PCI: compute Address Space length rather than using _LEN · 48728e07
      Bjorn Helgaas authored
      ACPI _CRS Address Space Descriptors have _MIN, _MAX, and _LEN.  Linux has
      been computing Address Spaces as [_MIN to _MIN + _LEN - 1].  Based on the
      tests in the bug reports below, Windows apparently uses [_MIN to _MAX].
      
      Per spec (ACPI 4.0, Table 6-40), for _CRS fixed-size, fixed location
      descriptors, "_LEN must be (_MAX - _MIN + 1)", and when that's true, it
      doesn't matter which way we compute the end.  But of course, there are
      BIOSes that don't follow this rule, and we're better off if Linux handles
      those exceptions the same way as Windows.
      
      This patch makes Linux use [_MIN to _MAX], as Windows seems to do.  This
      effectively reverts d558b483 and 03db42ad and replaces them with
      simpler code.
      
          https://bugzilla.kernel.org/show_bug.cgi?id=14337 (round)
          https://bugzilla.kernel.org/show_bug.cgi?id=15480 (truncate)
      Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      48728e07
    • Linus Torvalds's avatar
      Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 3fb938b2
      Linus Torvalds authored
      * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: fix matching rules for pseudo-multi-function cards
        pcmcia: pcmcia_dev_present bugfix
      3fb938b2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 970b0648
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        coda: move backing-dev.h kernel include inside __KERNEL__
        mtd: ensure that bdi entries are properly initialized and registered
        Move mtd_bdi_*mappable to mtdcore.c
        btrfs: convert to using bdi_setup_and_register()
        Catch filesystems lacking s_bdi
        drbd: Terminate a connection early if sending the protocol fails
        drbd: fix memory leak
        Fix JFFS2 sync silent failure
        smbfs: add bdi backing to mount session
        ncpfs: add bdi backing to mount session
        exofs: add bdi backing to mount session
        ecryptfs: add bdi backing to mount session
        coda: add bdi backing to mount session
        cifs: add bdi backing to mount session
        afs: add bdi backing to mount session.
        9p: add bdi backing to mount session
        bdi: add helper function for doing init and register of a bdi for a file system
        block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer
      970b0648
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 696e65c3
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: booke_wdt: fix build - unconstify watchdog_info
        watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.
        watchdog: sbc_fitpc2_wdt: fixed I/O operations order
        Watchdog: sb_wdog.c: Fix sibyte watchdog initialization
      696e65c3
    • Haojian Zhuang's avatar
      regulator: fix enabling regulator issue on max8925 · 4b99fef0
      Haojian Zhuang authored
      Fix regulator enabling issue that is caused by typo error in is_enabled().
      Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
      Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
      4b99fef0
    • Jens Axboe's avatar
      coda: move backing-dev.h kernel include inside __KERNEL__ · 33f60e96
      Jens Axboe authored
      Otherwise we must export backing-dev.h as well, which doesn't make
      any sense.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      33f60e96
    • Elina Pasheva's avatar
      net/usb: add sierra_net.c driver · eb4fd8cd
      Elina Pasheva authored
      Re-submitted based on comments from netdev community.
      Summary of the changes:
      1. Improved error handling.
      2. Added the missing timeout arguments to usb_control_msg().
      
      The following is a new Linux driver which exposes certain models of Sierra
      Wireless modems to the operating system as Network Interface Cards (NICs).
      
      This driver requires a version of the sierra.c driver which supports
      blacklisting to work properly. The blacklist in sierra.c rejects the interfaces
      claimed by sierra_net.c. Likewise, the sierra_net.c driver only accepts
      (i.e. whitelists) the interface(s) used for USB-to-WWAN traffic.
      The version of sierra.c which supports blacklisting is
      available from the sierra wireless knowledge base page for older kernels. It is
      also available in Linux kernel starting from version 2.6.31.
      
      This driver works with all Sierra Wireless devices configured with PID=68A3
      like USB305, USB306 provided the corresponding firmware version is I2.0
      (for USB305) or M3.0 (for USB306) and later.
      This driver will not work with earlier firmware versions than the ones shown
      above. In this case the driver will issue an error message indicating
      incompatibility and will not serve the device's USB-to-WWAN interface.
      
      Sierra_net.c sits atop a pre-existing Linux driver called usbnet.c.
      A series of hook functions are provided in sierra_net.c which are called by
      usbnet.c in response to a particular condition such as receipt or transmission
      of a data packet. As such, usbnet.c does most of the work of making
      a modem appear to the system as a network device and for properly exchanging
      traffic between the USB subsystem and the Network card interface.
      Sierra_net.c is concerned with managing the data exchanged between the
      USB-to-WWAN interface and the upper layers of the operating system.
      Signed-off-by: default avatarElina Pasheva <epasheva@sierrawireless.com>
      Signed-off-by: default avatarRory Filer <rfiler@sierrawireless.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eb4fd8cd
    • Torgny Johansson's avatar
      cdc_ether: fix autosuspend for mbm devices · 55964d72
      Torgny Johansson authored
      Autosuspend works until you bring the wwan interface up, then the
      device does not enter autosuspend anymore.
      
      The following patch fixes the problem by setting the .manage_power
      field in the mbm_info struct to the same as in the cdc_info struct
      (cdc_manager_power).
      Signed-off-by: default avatarTorgny Johansson <torgny.johansson@ericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55964d72
    • Dan Carpenter's avatar
      bluetooth: handle l2cap_create_connless_pdu() errors · 477fffb0
      Dan Carpenter authored
      l2cap_create_connless_pdu() can sometimes return ERR_PTR(-ENOMEM) or
      ERR_PTR(-EFAULT).
      Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
      Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      477fffb0
  7. 27 Apr, 2010 7 commits