Eric Lee / smarc-fsl-linux-kernel

22 Dec, 2009

1 commit

  • 292be57e1   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    bnx2: Fix bnx2_netif_stop() merge error.
    gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC
    gianfar: Fix stats support
    gianfar: Fix a filer bug
    bnx2: fixing a timout error due not refreshing TX timers correctly
    can/at91: don't check platform_get_irq's return value against zero
    mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion
    bnx2: reset_task is crashing the kernel. Fixing it.
    ipv6: fix an oops when force unload ipv6 module
    TI DaVinci EMAC: Fix MDIO bus frequency configuration
    e100: Fix broken cbs accounting due to missing memset.
    broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()
    e1000e: LED settings in EEPROM ignored on 82571 and 82572
    netxen: use module parameter correctly
    netns: fix net.ipv6.route.gc_min_interval_ms in netns
    Bluetooth: Prevent ill-timed autosuspend in USB driver
    Bluetooth: Fix L2CAP locking scheme regression
    Bluetooth: Ack L2CAP I-frames before retransmit missing packet
    Bluetooth: Fix unset of RemoteBusy flag for L2CAP
    Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()

    Linus Torvalds
     

19 Dec, 2009

1 commit

15 Dec, 2009

1 commit

12 Dec, 2009

1 commit

10 Dec, 2009

1 commit

  • 4ef58d4e2   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
    tree-wide: fix misspelling of "definition" in comments
    reiserfs: fix misspelling of "journaled"
    doc: Fix a typo in slub.txt.
    inotify: remove superfluous return code check
    hdlc: spelling fix in find_pvc() comment
    doc: fix regulator docs cut-and-pasteism
    mtd: Fix comment in Kconfig
    doc: Fix IRQ chip docs
    tree-wide: fix assorted typos all over the place
    drivers/ata/libata-sff.c: comment spelling fixes
    fix typos/grammos in Documentation/edac.txt
    sysctl: add missing comments
    fs/debugfs/inode.c: fix comment typos
    sgivwfb: Make use of ARRAY_SIZE.
    sky2: fix sky2_link_down copy/paste comment error
    tree-wide: fix typos "couter" -> "counter"
    tree-wide: fix typos "offest" -> "offset"
    fix kerneldoc for set_irq_msi()
    spidev: fix double "of of" in comment
    comment typo fix: sybsystem -> subsystem
    ...

    Linus Torvalds
     

09 Dec, 2009

1 commit

08 Dec, 2009

2 commits

06 Dec, 2009

2 commits

  • 28b4d5cc1   Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Browse Code »

    Conflicts:
    drivers/net/pcmcia/fmvj18x_cs.c
    drivers/net/pcmcia/nmclan_cs.c
    drivers/net/pcmcia/xirc2ps_cs.c
    drivers/net/wireless/ray_cs.c

    David S. Miller
     
  • d9b2c4d0b   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
    pcmcia: rework the irq_req_t typedef
    pcmcia: remove deprecated handle_to_dev() macro
    pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
    pcmcia: remove unused "window_t" typedef
    pcmcia: move some window-related code to pcmcia_ioctl.c
    pcmcia: Change window_handle_t logic to unsigned long
    pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
    drivers/pcmcia: remove unnecessary kzalloc
    pcmcia: correct handling for Zoomed Video registers in topic.h
    pcmcia: fix printk formats
    pcmcia: autoload module pcmcia
    pcmcia/staging: update comedi drivers
    PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
    PCMCIA: ss: allow PCI IRQs > 255
    PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
    PCMCIA: soc_common: constify soc_pcmcia_socket ops member
    PCMCIA: sa1111: remove duplicated initializers
    PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
    ...

    Linus Torvalds
     

04 Dec, 2009

1 commit

  • af901ca18   tree-wide: fix assorted typos all over the place ... Browse Code »

    That is "success", "unknown", "through", "performance", "[re|un]mapping"
    , "access", "default", "reasonable", "[con]currently", "temperature"
    , "channel", "[un]used", "application", "example","hierarchy", "therefore"
    , "[over|under]flow", "contiguous", "threshold", "enough" and others.

    Signed-off-by: André Goddard Rosa
    Signed-off-by: Jiri Kosina

    André Goddard Rosa
     

29 Nov, 2009

3 commits

  • 5fa9167a1   pcmcia: rework the irq_req_t typedef ... Browse Code »

    Most of the irq_req_t typedef'd struct can be re-worked quite
    easily:

    (1) IRQInfo2 was unused in any case, so drop it.

    (2) IRQInfo1 was used write-only, so drop it.

    (3) Instance (private data to be passed to the IRQ handler):
    Most PCMCIA drivers using pcmcia_request_irq() to actually
    register an IRQ handler set the "dev_id" to the same pointer
    as the "priv" pointer in struct pcmcia_device. Modify the two
    exceptions (ipwireless, ibmtr_cs) to also work this waym and
    set the IRQ handler's "dev_id" to p_dev->priv unconditionally.

    (4) Handler is to be of type irq_handler_t.

    (5) Handler != NULL already tells whether an IRQ handler is present.
    Therefore, we do not need the IRQ_HANDLER_PRESENT flag in
    irq_req_t.Attributes.

    CC: netdev@vger.kernel.org
    CC: linux-bluetooth@vger.kernel.org
    CC: linux-ide@vger.kernel.org
    CC: linux-wireless@vger.kernel.org
    CC: linux-scsi@vger.kernel.org
    CC: alsa-devel@alsa-project.org
    CC: Jaroslav Kysela
    CC: Jiri Kosina
    CC: Karsten Keil
    for the Bluetooth parts: Acked-by: Marcel Holtmann
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     
  • 6838b03fc   pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer ... Browse Code »

    pcmcia_request_window() only needs a pointer to struct pcmcia_device, not
    a pointer to a pointer.

    CC: netdev@vger.kernel.org
    CC: linux-wireless@vger.kernel.org
    CC: linux-scsi@vger.kernel.org
    CC: Jiri Kosina
    Acked-by: Karsten Keil (for ISDN)
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     
  • 868575d1e   pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page() ... Browse Code »

    No logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page()

    [linux@dominikbrodowski.net: update to 2.6.31]
    CC: netdev@vger.kernel.org
    CC: linux-wireless@vger.kernel.org
    CC: linux-scsi@vger.kernel.org
    CC: Jiri Kosina
    Acked-by: Karsten Keil (for ISDN)
    Signed-off-by: Magnus Damm
    Signed-off-by: Dominik Brodowski

    Magnus Damm
     

20 Nov, 2009

1 commit

  • 5452fee23   drivers/isdn/gigaset: tasklet_init - Remove unnecessary leading & from second arg ... Browse Code »

    Changed function pointer use from non-majority address-of style
    to majority short form without & via:

    grep -rPl "\btasklet_init\s*\([^,\)]+,\s*\&" drivers/isdn | while read file ; do \
    perl -i -e 'local $/; while (<>) { s@(\btasklet_init\s*\([^,\)]+,\s*)\&@\1@g ; print ; }' $file ;\
    done

    Compile tested allyesconfig x86

    Signed-off-by: Joe Perches

    drivers/isdn/gigaset/bas-gigaset.c | 4 ++--
    drivers/isdn/gigaset/common.c | 2 +-
    drivers/isdn/gigaset/interface.c | 2 +-
    drivers/isdn/gigaset/ser-gigaset.c | 2 +-
    drivers/isdn/gigaset/usb-gigaset.c | 2 +-
    5 files changed, 6 insertions(+), 6 deletions(-)
    Signed-off-by: David S. Miller

    Joe Perches
     

19 Nov, 2009

2 commits

  • 3505d1a9f   Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    Conflicts:
    drivers/net/sfc/sfe4001.c
    drivers/net/wireless/libertas/cmd.c
    drivers/staging/Kconfig
    drivers/staging/Makefile
    drivers/staging/rtl8187se/Kconfig
    drivers/staging/rtl8192e/Kconfig

    David S. Miller
     
  • 486bfe5c7   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
    cxgb3: fix premature page unmap
    ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts
    vlan: Fix register_vlan_dev() error path
    gro: Fix illegal merging of trailer trash
    sungem: Fix Serdes detection.
    net: fix mdio section mismatch warning
    ppp: fix BUG on non-linear SKB (multilink receive)
    ixgbe: Fixing EEH handler to handle more than one error
    net: Fix the rollback test in dev_change_name()
    Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."
    TI Davinci EMAC : Fix Console Hang when bringing the interface down
    smsc911x: Fix Console Hang when bringing the interface down.
    mISDN: fix error return in HFCmulti_init()
    forcedeth: mac address fix
    r6040: fix version printing
    Bluetooth: Fix regression with L2CAP configuration in Basic Mode
    Bluetooth: Select Basic Mode as default for SOCK_SEQPACKET
    Bluetooth: Set general bonding security for ACL by default
    r8169: Fix receive buffer length when MTU is between 1515 and 1536
    can: add the missing netlink get_xstats_size callback
    ...

    Linus Torvalds
     

17 Nov, 2009

1 commit

16 Nov, 2009

2 commits

11 Nov, 2009

1 commit

10 Nov, 2009

1 commit

  • 1ce55238e   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
    net/fsl_pq_mdio: add module license GPL
    can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo()
    can: should not use __dev_get_by_index() without locks
    hisax: remove bad udelay call to fix build error on ARM
    ipip: Fix handling of DF packets when pmtudisc is OFF
    qlge: Set PCIe reset type for EEH to fundamental.
    qlge: Fix early exit from mbox cmd complete wait.
    ixgbe: fix traffic hangs on Tx with ioatdma loaded
    ixgbe: Fix checking TFCS register for TXOFF status when DCB is enabled
    ixgbe: Fix gso_max_size for 82599 when DCB is enabled
    macsonic: fix crash on PowerBook 520
    NET: cassini, fix lock imbalance
    ems_usb: Fix byte order issues on big endian machines
    be2net: Bug fix to send config commands to hardware after netdev_register
    be2net: fix to set proper flow control on resume
    netfilter: xt_connlimit: fix regression caused by zero family value
    rt2x00: Don't queue ieee80211 work after USB removal
    Revert "ipw2200: fix oops on missing firmware"
    decnet: netdevice refcount leak
    netfilter: nf_nat: fix NAT issue in 2.6.30.4+
    ...

    Linus Torvalds
     

09 Nov, 2009

4 commits

07 Nov, 2009

1 commit

  • cc05368c5   hisax: remove bad udelay call to fix build error on ARM ... Browse Code »

    The hisax ISDN driver fails to build on ARM with CONFIG_HISAX_ELSA:

    | drivers/built-in.o: In function `modem_set_dial':
    | drivers/isdn/hisax/elsa_ser.c:535: undefined reference to `__bad_udelay'
    | drivers/isdn/hisax/elsa_ser.c:544: undefined reference to `__bad_udelay'
    | drivers/built-in.o: In function `modem_set_init':
    | drivers/isdn/hisax/elsa_ser.c:486: undefined reference to `__bad_udelay'
    | [...]

    According to the comment in arch/arm/include/asm/delay.h, __bad_udelay
    is specifically designed on ARM to produce a build failure when udelay
    is called with a value > 2000.

    Signed-off-by: Martin Michlmayr
    Signed-off-by: David S. Miller

    Martin Michlmayr
     

06 Nov, 2009

2 commits

05 Nov, 2009

6 commits

  • 286e633ef   isdn: hfc_usb: Fix read buffer overflow ... Browse Code »

    Check whether index is within bounds before testing the element.

    Signed-off-by: Roel Kluin
    Cc: Karsten Keil
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Roel Kluin
     
  • a947c8f03   isdn: hisax: Fix test in waitforxfw ... Browse Code »

    The negation makes it a bool before the comparison and hence it
    will never be 0x40.

    Signed-off-by: Roel Kluin
    Cc: Karsten Keil
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Roel Kluin
     
  • b9db21f8b   isdn: eicon: Return on error ... Browse Code »

    When diva_strace_read_uint returns an error, return even from
    process_idi_event, because l2_state is uninitialized.

    Signed-off-by: Jiri Slaby
    Cc: Karsten Keil
    Acked-by: Armin Schindler
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Jiri Slaby
     
  • 1ea70841f   isdn: eicon: Use offsetof ... Browse Code »

    Use offsetof instead of explicit implementation.

    * fixes bug with omitted & like:
    len = (byte)(((T30_INFO *) 0)->station_id + 20)

    * avoids compiler warnings with wrong sizes (pointer-to-char cast):
    len = (byte)(&(((T30_INFO *) 0)->universal_6));

    * cleans up the code

    Signed-off-by: Jiri Slaby
    Cc: Karsten Keil
    Acked-by: Armin Schindler
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Jiri Slaby
     
  • 08cb3f60b   misdn: Fix reversed 'if' in st_own_ctrl ... Browse Code »

    The current code probably returns -EINVAL a lot. Otherwise it would oops.

    Compile tested only. Found by smatch (http://repo.or.cz/w/smatch.git).

    Signed-off-by: Dan Carpenter
    Cc: Karsten Keil
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Dan Carpenter
     
  • 02303d202   isdn: hisax: Fix lock imbalance. ... Browse Code »

    Add omittted unlocks to 2 functions.

    Signed-off-by: Jiri Slaby
    Cc: Karsten Keil
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    Jiri Slaby
     

30 Oct, 2009

1 commit

  • 49b2de8e6   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (43 commits)
    net: Fix 'Re: PACKET_TX_RING: packet size is too long'
    netdev: usb: dm9601.c can drive a device not supported yet, add support for it
    qlge: Fix firmware mailbox command timeout.
    qlge: Fix EEH handling.
    AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2)
    bonding: fix a race condition in calls to slave MII ioctls
    virtio-net: fix data corruption with OOM
    sfc: Set ip_summed correctly for page buffers passed to GRO
    cnic: Fix L2CTX_STATUSB_NUM offset in context memory.
    MAINTAINERS: rt2x00 list is moderated
    airo: Reorder tests, check bounds before element
    mac80211: fix for incorrect sequence number on hostapd injected frames
    libertas spi: fix sparse errors
    mac80211: trivial: fix spelling in mesh_hwmp
    cfg80211: sme: deauthenticate on assoc failure
    mac80211: keep auth state when assoc fails
    mac80211: fix ibss joining
    b43: add 'struct b43_wl' missing declaration
    b43: Fix Bugzilla #14181 and the bug from the previous 'fix'
    rt2x00: Fix crypto in TX frame for rt2800usb
    ...

    Linus Torvalds
     

29 Oct, 2009

4 commits