1. 31 3月, 2011 28 次提交
  2. 30 3月, 2011 12 次提交
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a8e498b7
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/qe_ic: Fix another breakage from the irq_data conversion
        powerpc/8xx: Fix another breakage from the irq_data conversion
        powerpc/cell: Use handle_edge_eoi_irq for real
        powerpc/pseries: Enable Chelsio network and iWARP drivers
        powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory
        powerpc: Fix accounting of softirq time when idle
        powerpc/pseries/smp: query-cpu-stopped-state support won't change
        powerpc/xics: Use hwirq for xics domain irq number
        powerpc/xics: Fix numberspace mismatch from irq_desc conversion
        powerpc: Wire up new syscalls
        powerpc/booke: Correct the SPRN_MAS5 definition.
        powerpc: ARCH_PFN_OFFSET should be unsigned long
        powerpc: Implement dma_mmap_coherent()
        powerpc/nvram: Don't overwrite oops/panic report on normal shutdown
        powerpc: Restore some misc devices to our configs
      a8e498b7
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · a8a44921
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: bitops: fix include order after little endian inclusion
        Blackfin: defconfigs: update after misc devices defaulted to N
        Blackfin: use more standard pr_fmt in the module loader
      a8a44921
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 85eb1513
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
        ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
        ARM: 6838/1: etm: fix section mismatch warning
        ARM: 6837/1: remove unused pci_fixup_prpmc1100
        ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
        Fix the broken build for Marvell Dove platform.
        ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
        ARM: 6834/1: perf: reset counters on all CPUs during initialisation
        ARM: 6833/1: perf: add required isbs() to ARMv7 backend
        ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
        ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
        arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
        eukrea_mbimxsd51: add SD Card detect
        eukrea_mbimxsd25-baseboard: add SD card detect
        mx3/eukrea_mbimxsd-baseboard: add SD card detect support
        mx3/eukrea_mbimxsd-baseboard: fix gpio request
        ARM: mxs/mx28evk: add mmc device
        ARM: mxs/mx23evk: add mmc device
        ARM: mxs: dynamically allocate mmc device
        ARM: mx51_efika: update platform data for new mfd changes
        mx2/iomux: Set direction for CSPI2 pins
        ...
      85eb1513
    • T
      avr32: Fix missing irq namespace conversion · dd8ea6af
      Thomas Gleixner 提交于
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      dd8ea6af
    • R
      powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip · eead4d5c
      Richard Cochran 提交于
      These two functions disappeared in commit
      
          0c6f8a8b
          "genirq: Remove compat code"
      
      but they still exist in qe_ic.h.
      This patch renames the function to their new names.
      Signed-off-by: NRichard Cochran <richard.cochran@omicron.at>
      Cc: linuxppc-dev@lists.ozlabs.org
      Cc: Lennert Buytenhek <buytenh@secretlab.ca>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      LKML-Reference: <20110330132504.GA31832@riccoc20.at.omicron.at>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      eead4d5c
    • T
    • G
      arm: versatile : Fix typo introduced in irq namespace cleanup · e2823266
      Grant Likely 提交于
      Commit 6845664a(arm: Cleanup the irq namespace) introduces a typo
      causing a build failure for the versatile platform.
      
      [ tglx: Sorry, my bad. Have no idea how I fatfingered that ]
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: linux-arm-kernel@lists.infradead.org
      LKML-Reference: <20110330060229.27397.7628.stgit@ponder>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      e2823266
    • J
      Atheros, atl2: Fix mem leaks in error paths of atl2_set_eeprom · ad19031b
      Jesper Juhl 提交于
      We leak in some error paths of drivers/net/atlx/atl2.c:atl2_set_eeprom().
      The memory allocated to 'eeprom_buff' is not freed when we return -EIO.
      This patch fixes that up and also removes a pointless explicit cast.
      Signed-off-by: NJesper Juhl <jj@chaosbits.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ad19031b
    • D
      netdev: fix mtu check when TSO is enabled · 79b569f0
      Daniel Lezcano 提交于
      In case the device where is coming from the packet has TSO enabled,
      we should not check the mtu size value as this one could be bigger
      than the expected value.
      
      This is the case for the macvlan driver when the lower device has
      TSO enabled. The macvlan inherit this feature and forward the packets
      without fragmenting them. Then the packets go through dev_forward_skb
      and are dropped. This patch fix this by checking TSO is not enabled
      when we want to check the mtu size.
      Signed-off-by: NDaniel Lezcano <daniel.lezcano@free.fr>
      Acked-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      79b569f0
    • A
      net/usb: Ethernet quirks for the LG-VL600 4G modem · 7a635ea9
      Andrzej Zaborowski 提交于
      This adds a driver for the CDC Ethernet part of this modem.  The
      device's ID is blacklisted in cdc_ether.c and is white-listed in
      this new driver because of the quirks needed to make it useful.
      The modem's firmware exposes a CDC ACM port for modem control and a
      CDC Ethernet port for network data.  The descriptors look fine but
      both ports actually are some sort of multiplexers requiring non-
      standard headers added/removed from every packet or they get
      ignored.  All information is based on a usb traffic log from a
      Windows machine.
      
      On the Verizon 4G network I've seen speeds up to 1.1MB/s so far with
      this driver, a speed-o-meter site reports 16.2Mbps/10.5Mbps.
      Userspace scripts are required to talk to the CDC ACM port.
      Signed-off-by: NAndrzej Zaborowski <balrogg@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7a635ea9
    • M
      phylib: phy_attach_direct: phy_init_hw can fail, add cleanup · d005a09e
      Marc Kleine-Budde 提交于
      The function phy_attach_direct attaches the phy and calls phy_init_hw.
      phy_init_hw can fail, but the phy is still marked as attached. Successive
      calls to phy_attach_direct will fail because the phy is busy.
      
      [    1.020000] eth0: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr=1:00, irq=-1)
      [    1.030000] eth1: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr=1:01, irq=-1)
      [    2.050000] Sending DHCP requests .
      [    3.020000] PHY: 1:00 - Link is Up - 100/Full
      [    5.110000] ..... timed out!
      [   87.660000] IP-Config: Reopening network devices...
      [   88.190000] FEC: MDIO read timeout
      [   88.190000] eth0: could not attach to PHY
      [   88.190000] IP-Config: Failed to open eth0
      [   88.210000] FEC: MDIO read timeout
      [   88.210000] eth1: could not attach to PHY
      [   88.210000] IP-Config: Failed to open eth1
      [   88.220000] IP-Config: No network devices available.
      [   88.220000] Freeing init memory: 6968K
      
      [...]
      
      starting network interfaces...
      ip: RTNETLINK answers: File exists
      [   94.000000] net eth0: PHY already attached
      [   94.010000] eth0: could not attach to PHY
      ip: SIOCSIFFLAGS: Device or resource busy
      
      This patch adds phy_detach to clean up if phy_init_hw fails.
      Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d005a09e
    • L
      bridge: mcast snooping, fix length check of snooped MLDv1/2 · ff9a57a6
      Linus Lüssing 提交于
      "len = ntohs(ip6h->payload_len)" does not include the length of the ipv6
      header itself, which the rest of this function assumes, though.
      
      This leads to a length check less restrictive as it should be in the
      following line for one thing. For another, it very likely leads to an
      integer underrun when substracting the offset and therefore to a very
      high new value of 'len' due to its unsignedness. This will ultimately
      lead to the pskb_trim_rcsum() practically never being called, even in
      the cases where it should.
      Signed-off-by: NLinus Lüssing <linus.luessing@web.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff9a57a6