Eric Lee / smarc-fsl-linux-kernel

31 Mar, 2011

3 commits

  • c031235b3   atm/solos-pci: Don't flap VCs when carrier state changes ... Browse Code »

    Don't flap VCs when carrier state changes; higher-level protocols
    can detect loss of connectivity and act accordingly. This is more
    consistent with how other network interfaces work.

    We no longer use release_vccs() so we can delete it.

    release_vccs() was duplicated from net/atm/common.c; make the
    corresponding function exported, since other code duplicates it
    and could leverage it if it were public.

    Signed-off-by: Philip A. Prindeville
    Signed-off-by: David S. Miller

    Philip A. Prindeville
     
  • 18b429e74   atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump ... Browse Code »

    Omit pkt_hdr preamble when dumping transmitted packet as hex-dump;
    we can pull this up because the frame has already been sent, and
    dumping it is the last thing we do with it before freeing it.

    Also include the size, vpi, and vci in the debug as is done on
    receive.

    Use "port" consistently instead of "device" intermittently.

    Signed-off-by: Philip Prindeville
    Signed-off-by: David S. Miller

    Philip A. Prindeville
     
  • 1e19e6585   atm/solos-pci: Use VPI.VCI notation uniformly. ... Browse Code »

    Use VPI.VCI notation consistently throughout the module. This is the
    one remaining place where the VCI is used before the VPI in any output.

    Signed-off-by: Philip Prindeville
    Signed-off-by: David S. Miller

    Philip A. Prindeville
     

19 Mar, 2011

1 commit

  • e16b396ce   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: (47 commits)
    doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
    Update cpuset info & webiste for cgroups
    dcdbas: force SMI to happen when expected
    arch/arm/Kconfig: remove one to many l's in the word.
    asm-generic/user.h: Fix spelling in comment
    drm: fix printk typo 'sracth'
    Remove one to many n's in a word
    Documentation/filesystems/romfs.txt: fixing link to genromfs
    drivers:scsi Change printk typo initate -> initiate
    serial, pch uart: Remove duplicate inclusion of linux/pci.h header
    fs/eventpoll.c: fix spelling
    mm: Fix out-of-date comments which refers non-existent functions
    drm: Fix printk typo 'failled'
    coh901318.c: Change initate to initiate.
    mbox-db5500.c Change initate to initiate.
    edac: correct i82975x error-info reported
    edac: correct i82975x mci initialisation
    edac: correct commented info
    fs: update comments to point correct document
    target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
    ...

    Trivial conflict in fs/eventpoll.c (spelling vs addition)

    Linus Torvalds
     

01 Mar, 2011

1 commit

15 Feb, 2011

1 commit

14 Feb, 2011

1 commit

  • da1ab3e23   ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_skb() interact badly. ... Browse Code »

    If alloc_skb() fails to allocate memory and returns NULL then we want to
    return -ENOMEM from drivers/atm/solos-pci.c::popen() regardless of the
    value of net_ratelimit(). The way the code is today, we may not return if
    net_ratelimit() returns 0, then we'll proceed to pass a NULL pointer to
    skb_put() which will blow up in our face.
    This patch ensures that we always return -ENOMEM on alloc_skb() failure
    and only let the dev_warn() be controlled by the value of net_ratelimit().

    Signed-off-by: Jesper Juhl
    Signed-off-by: David S. Miller

    Jesper Juhl
     

02 Feb, 2011

1 commit

25 Jan, 2011

1 commit

22 Jan, 2011

1 commit

14 Jan, 2011

1 commit

  • 008d23e48   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
    Documentation/trace/events.txt: Remove obsolete sched_signal_send.
    writeback: fix global_dirty_limits comment runtime -> real-time
    ppc: fix comment typo singal -> signal
    drivers: fix comment typo diable -> disable.
    m68k: fix comment typo diable -> disable.
    wireless: comment typo fix diable -> disable.
    media: comment typo fix diable -> disable.
    remove doc for obsolete dynamic-printk kernel-parameter
    remove extraneous 'is' from Documentation/iostats.txt
    Fix spelling milisec -> ms in snd_ps3 module parameter description
    Fix spelling mistakes in comments
    Revert conflicting V4L changes
    i7core_edac: fix typos in comments
    mm/rmap.c: fix comment
    sound, ca0106: Fix assignment to 'channel'.
    hrtimer: fix a typo in comment
    init/Kconfig: fix typo
    anon_inodes: fix wrong function name in comment
    fix comment typos concerning "consistent"
    poll: fix a typo in comment
    ...

    Fix up trivial conflicts in:
    - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
    - fs/ext4/ext4.h

    Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

    Linus Torvalds
     

10 Jan, 2011

1 commit

  • 6a75da4a1   Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() a… ... Browse Code »

    …nd don't leak memory.

    Failure to call release_firmware() will result in memory leak in
    drivers/atm/ambassador.c::ucode_init().
    This patch makes sure we always call release_firmware() when needed,
    thus removing the leak(s).

    Yes, I know checkpatch complains about this patch, but it was either that
    or completely mess up the existing style, so I opted to use the existing
    style and live with the checkpatch related flak.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

    Jesper Juhl
     

05 Jan, 2011

1 commit

01 Jan, 2011

1 commit

  • b9556f9a1   drivers/atm/atmtcp.c: add missing atm_dev_put ... Browse Code »

    The earlier call to atm_dev_lookup increases the reference count of dev,
    so decrease it on the way out.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @@
    expression x, E;
    constant C;
    @@

    x = atm_dev_lookup(...);
    ... when != false x != NULL
    when != true x == NULL
    when != \(E = x\|x = E\)
    when != atm_dev_put(dev);
    *return -C;
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     

23 Dec, 2010

1 commit

18 Dec, 2010

1 commit

11 Dec, 2010

1 commit

  • d9ca676bc   atm: correct sysfs 'device' link creation and parent relationships ... Browse Code »

    The ATM subsystem was incorrectly creating the 'device' link for ATM
    nodes in sysfs. This led to incorrect device/parent relationships
    exposed by sysfs and udev. Instead of rolling the 'device' link by hand
    in the generic ATM code, pass each ATM driver's bus device down to the
    sysfs code and let sysfs do this stuff correctly.

    Signed-off-by: Dan Williams
    Signed-off-by: David S. Miller

    Dan Williams
     

09 Dec, 2010

1 commit

19 Nov, 2010

1 commit

  • 30dfe2c05   atm: fore200e: Fix build warning. ... Browse Code »

    GCC (rightfully) complains that:

    drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined

    This is due to the FORE200E_NEXT_ENTRY macro, which essentially
    evaluates to:

    i = ++i % m

    Make it what's explicitly intended here which is:

    i = (i + 1) % m

    and the warning goes away.

    Signed-off-by: David S. Miller

    David S. Miller
     

09 Nov, 2010

2 commits

02 Nov, 2010

1 commit

  • b595076a1   tree-wide: fix comment/printk typos ... Browse Code »

    "gadget", "through", "command", "maintain", "maintain", "controller", "address",
    "between", "initiali[zs]e", "instead", "function", "select", "already",
    "equal", "access", "management", "hierarchy", "registration", "interest",
    "relative", "memory", "offset", "already",

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Jiri Kosina

    Uwe Kleine-König
     

27 Oct, 2010

1 commit

25 Oct, 2010

1 commit

  • 229aebb87   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds
     

21 Oct, 2010

1 commit

18 Oct, 2010

1 commit

  • 631dd1a88   Update broken web addresses in the kernel. ... Browse Code »

    The patch below updates broken web addresses in the kernel

    Signed-off-by: Justin P. Mattock
    Cc: Maciej W. Rozycki
    Cc: Geert Uytterhoeven
    Cc: Finn Thain
    Cc: Randy Dunlap
    Cc: Matt Turner
    Cc: Dimitry Torokhov
    Cc: Mike Frysinger
    Acked-by: Ben Pfaff
    Acked-by: Hans J. Koch
    Reviewed-by: Finn Thain
    Signed-off-by: Jiri Kosina

    Justin P. Mattock
     

12 Oct, 2010

3 commits

04 Oct, 2010

1 commit

  • 1790c228f   drivers/atm/idt77252.c: Remove unnecessary error check ... Browse Code »

    This code does not call deinit_card(card); in an error case, as done in
    other error-handling code in the same function. But actually, the called
    function init_sram can only return 0, so there is no need for the error
    check at all.

    init_sram is also given a void return type, and its single return statement
    at the end of the function is dropped.

    A simplified version of the sematic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @r exists@
    @r@
    statement S1,S2,S3;
    constant C1,C2,C3;
    @@

    *if (...)
    {... S1 return -C1;}
    ...
    *if (...)
    {... when != S1
    return -C2;}
    ...
    *if (...)
    {... S1 return -C3;}
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     

22 Sep, 2010

1 commit

07 Sep, 2010

1 commit

  • a0ece2853   drivers/atm/firestream.c: Fix unsigned return type ... Browse Code »

    The function has an unsigned return type, but returns a negative constant
    to indicate an error condition. The result of calling the function is
    always stored in a variable of type (signed) int, and thus unsigned can be
    dropped from the return type.

    A sematic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @exists@
    identifier f;
    constant C;
    @@

    unsigned f(...)
    { }
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     

17 Aug, 2010

1 commit

  • 6f74dbbc2   drivers/atm: Adjust confusing if indentation ... Browse Code »

    Indent the branch of an if.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @r disable braces4@
    position p1,p2;
    statement S1,S2;
    @@

    (
    if (...) { ... }
    |
    if (...) S1@p1 S2@p2
    )

    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@

    if (p1[0].column == p2[0].column):
    cocci.print_main("branch",p1)
    cocci.print_secs("after",p2)
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     

13 Aug, 2010

1 commit

10 Aug, 2010

1 commit

  • f6cec0ae5   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: (59 commits)
    igbvf.txt: Add igbvf Documentation
    igb.txt: Add igb documentation
    e100/e1000*/igb*/ixgb*: Add missing read memory barrier
    ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
    netxen: protect tx timeout recovery by rtnl lock
    isdn: gigaset: use after free
    isdn: gigaset: add missing unlock
    solos-pci: Fix race condition in tasklet RX handling
    pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
    net: disable preemption before call smp_processor_id()
    tcp: no md5sig option size check bug
    iwlwifi: fix locking assertions
    iwlwifi: fix TX tracer
    isdn: fix information leak
    net: Fix napi_gro_frags vs netpoll path
    usbnet: remove noisy and hardly useful printk
    rtl8180: avoid potential NULL deref in rtl8180_beacon_work
    ath9k: Remove myself from the MAINTAINERS list
    libertas: scan before assocation if no BSSID was given
    libertas: fix association with some APs by using extended rates
    ...

    Linus Torvalds
     

08 Aug, 2010

1 commit

  • 1f6ea6e51   solos-pci: Fix race condition in tasklet RX handling ... Browse Code »

    We were seeing faults in the solos-pci receive tasklet when packets
    arrived for a VCC which was currently being closed:

    [18842.727906] EIP: [] br2684_push+0x19/0x234 [br2684] SS:ESP 0068:dfb89d14

    [18845.090712] [] ? do_page_fault+0x0/0x2e1
    [18845.120042] [] ? br2684_push+0x19/0x234 [br2684]
    [18845.153530] [] solos_bh+0x28b/0x7c8 [solos_pci]
    [18845.186488] [] ? solos_irq+0x2d/0x51 [solos_pci]
    [18845.219960] [] ? handle_irq+0x3b/0x48
    [18845.247732] [] ? irq_exit+0x34/0x57
    [18845.274437] [] tasklet_action+0x42/0x69
    [18845.303247] [] __do_softirq+0x8e/0x129
    [18845.331540] [] do_softirq+0x25/0x2a
    [18845.358274] [] _local_bh_enable_ip+0x5e/0x6a
    [18845.389677] [] local_bh_enable+0xb/0xe
    [18845.417944] [] ppp_unregister_channel+0x32/0xbb [ppp_generic]
    [18845.458193] [] pppox_unbind_sock+0x18/0x1f [pppox]

    This patch uses an RCU-inspired approach to fix it. In the RX tasklet's
    find_vcc() function we first refuse to use a VCC which already has the
    ATM_VF_READY bit cleared. And in the VCC close function, we synchronise
    with the tasklet to ensure that it can't still be using the VCC before
    we continue and allow the VCC to be destroyed.

    Signed-off-by: David Woodhouse
    Tested-by: Nathan Williams
    Cc: stable@kernel.org
    Signed-off-by: David S. Miller

    David Woodhouse
     

06 Aug, 2010

2 commits

  • 2dc115813   of/device: Replace struct of_device with struct platform_device ... Browse Code »

    of_device is just an alias for platform_device, so remove it entirely. Also
    replace to_of_device() with to_platform_device() and update comment blocks.

    This patch was initially generated from the following semantic patch, and then
    edited by hand to pick up the bits that coccinelle didn't catch.

    @@
    @@
    -struct of_device
    +struct platform_device

    Signed-off-by: Grant Likely
    Reviewed-by: David S. Miller

    Grant Likely
     
  • 03c0c29af   Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
    of/platform: Register of_platform_drivers with an "of:" prefix
    of/address: Clean up function declarations
    of/spi: call of_register_spi_devices() from spi core code
    of: Provide default of_node_to_nid() implementation.
    of/device: Make of_device_make_bus_id() usable by other code.
    of/irq: Fix endian issues in parsing interrupt specifiers
    of: Fix phandle endian issues
    of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
    of: remove of_default_bus_ids
    of: make of_find_device_by_node generic
    microblaze: remove references to of_device and to_of_device
    sparc: remove references to of_device and to_of_device
    powerpc: remove references to of_device and to_of_device
    of/device: Replace of_device with platform_device in includes and core code
    of/device: Protect against binding of_platform_drivers to non-OF devices
    of: remove asm/of_device.h
    of: remove asm/of_platform.h
    of/platform: remove all of_bus_type and of_platform_bus_type references
    of: Merge of_platform_bus_type with platform_bus_type
    drivercore/of: Add OF style matching to platform bus
    ...

    Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
    some obj-y removals by the devicetree branch, while the microblaze
    updates added a new file.

    Linus Torvalds
     

24 Jul, 2010

2 commits