Eric Lee / smarc-fsl-linux-kernel

10 Nov, 2011

2 commits

09 Nov, 2011

2 commits

08 Nov, 2011

2 commits

  • f3f668b0e   Bluetooth: Use miliseconds for L2CAP channel timeouts ... Browse Code »

    Timers set by __set_chan_timer() should use miliseconds instead of
    jiffies. Commit 942ecc9c4643db5ce071562e0a23f99464d6b461 updated
    l2cap_set_timer() so it expects timeout to be specified in msecs
    instead of jiffies. This makes timeouts unreliable when CONFIG_HZ
    is not set to 1000.

    Signed-off-by: Andrzej Kaczmarek
    Signed-off-by: Gustavo F. Padovan

    Andrzej Kaczmarek
     
  • 94956eed1   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
    forcedeth: fix a few sparse warnings (variable shadowing)
    forcedeth: Improve stats counters
    forcedeth: remove unneeded stats updates
    forcedeth: Acknowledge only interrupts that are being processed
    forcedeth: fix race when unloading module
    MAINTAINERS/rds: update maintainer
    wanrouter: Remove kernel_lock annotations
    usbnet: fix oops in usbnet_start_xmit
    ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
    etherh: Add MAINTAINERS entry for etherh
    bonding: comparing a u8 with -1 is always false
    sky2: fix regression on Yukon Optima
    netlink: clarify attribute length check documentation
    netlink: validate NLA_MSECS length
    i825xx:xscale:8390:freescale: Fix Kconfig dependancies
    macvlan: receive multicast with local address
    tg3: Update version to 3.121
    tg3: Eliminate timer race with reset_task
    tg3: Schedule at most one tg3_reset_task run
    tg3: Obtain PCI function number from device
    ...

    Linus Torvalds
     

07 Nov, 2011

1 commit

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

05 Nov, 2011

3 commits

03 Nov, 2011

1 commit

02 Nov, 2011

1 commit

  • 73cb88ecb   net: make the tcp and udp file_operations for the /proc stuff const ... Browse Code »

    the tcp and udp code creates a set of struct file_operations at runtime
    while it can also be done at compile time, with the added benefit of then
    having these file operations be const.

    the trickiest part was to get the "THIS_MODULE" reference right; the naive
    method of declaring a struct in the place of registration would not work
    for this reason.

    Signed-off-by: Arjan van de Ven
    Signed-off-by: David S. Miller

    Arjan van de Ven
     

01 Nov, 2011

11 commits

  • e23ebf0fa   ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function. ... Browse Code »

    This is to address the following error during the compilation:

    In file included from kernel/sysctl_binary.c:6:
    include/net/ip_vs.h:1406: error: expected identifier or ‘(’ before ‘{’ token
    make[1]: *** [kernel/sysctl_binary.o] Error 1
    make[1]: *** Waiting for unfinished jobs....

    That manifests itself when CONFIG_IP_VS_NFCT is undefined in .config file.

    Signed-off-by: Krzysztof Wilczynski
    Signed-off-by: Simon Horman

    Krzysztof Wilczynski
     
  • 8d83f63b1   netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h ... Browse Code »

    This patch exports several definitions that used to live under
    include/net/netfilter/nf_nat.h. These definitions, although not
    exported, have been used by iptables and other userspace
    applications like miniupnpd since long time. Basically, these
    userspace tools included some internal definition of the required
    structures and they assume no changes in the binary representation
    (which is OK indeed).

    To resolve this situation, this patch makes public the required
    structure and install them in INSTALL_HDR_PATH.

    See: https://bugs.gentoo.org/376873, for more information.

    This patch is heavily based on the initial patch sent by:

    Anthony G. Basile

    Which was entitled:

    netfilter: export sanitized nf_nat.h to INSTALL_HDR_PATH

    Signed-off-by: Pablo Neira Ayuso

    Pablo Neira Ayuso
     
  • 4a516f110   ipvs: Remove unused return value of protocol state transitions ... Browse Code »

    Acked-by: Julian Anastasov
    Acked-by Hans Schillstrom
    Signed-off-by: Simon Horman
    Signed-off-by: Pablo Neira Ayuso

    Simon Horman
     
  • 3c2de2ae0   ipvs: Remove unused parameter from ip_vs_confirm_conntrack() ... Browse Code »

    Acked-by: Julian Anastasov
    Acked-by Hans Schillstrom
    Signed-off-by: Simon Horman
    Signed-off-by: Pablo Neira Ayuso

    Simon Horman
     
  • b9075fa96   treewide: use __printf not __attribute__((format(printf,...))) ... Browse Code »

    Standardize the style for compiler based printf format verification.
    Standardized the location of __printf too.

    Done via script and a little typing.

    $ grep -rPl --include=*.[ch] -w "__attribute__" * | \
    grep -vP "^(tools|scripts|include/linux/compiler-gcc.h)" | \
    xargs perl -n -i -e 'local $/; while (<>) { s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.+)\s*,\s*(.+)\s*\)\s*\)\s*\)/__printf($1, $2)/g ; print; }'

    [akpm@linux-foundation.org: revert arch bits]
    Signed-off-by: Joe Perches
    Cc: "Kirill A. Shutemov"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • 1d58996da   bluetooth: macroize two small inlines to avoid module.h ... Browse Code »

    These two small inlines make calls to try_module_get() and
    module_put() which would force us to keep module.h present
    within yet another common include header. We can avoid this
    by turning them into macros. The hci_dev_hold construct
    is patterned off of raw_spin_trylock_irqsave() in spinlock.h

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • 69e7dae40   ip_vs.h: fix implicit use of module_get/module_put from module.h ... Browse Code »

    This file was using the module get/put functions in two simple inline
    functions. But module_get/put were only within scope because of
    the implicit presence of module.h being everywhere.

    Rather than add module.h to another file in include/ -- which is
    exactly the thing we are trying to avoid, simply convert these
    one-line functions into a define, as per what was done for the
    device_schedule_callback() in commit 523ded71de0c5e669733.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • 34641c6d0   nf_conntrack.h: fix up fallout from implicit moduleparam.h presence ... Browse Code »

    The implicit presence of module.h everywhere meant that this header
    also was getting moduleparam.h which defines struct kernel_param.

    Since it only needs to know that kernel_param is a struct, call that
    out instead of adding an include of moduleparam.h -- to get rid of this:

    include/net/netfilter/nf_conntrack.h:316: warning: 'struct kernel_param' declared inside parameter list
    include/net/netfilter/nf_conntrack.h:316: warning: its scope is only this definition or declaration, which is probably not what you want

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • de4772542   include: replace linux/module.h with "struct module" wherever possible ... Browse Code »
    43

    The pretty much brings in the kitchen sink along
    with it, so it should be avoided wherever reasonably possible in
    terms of being included from other commonly used
    files, as it results in a measureable increase on compile times.

    The worst culprit was probably device.h since it is used everywhere.
    This file also had an implicit dependency/usage of mutex.h which was
    masked by module.h, and is also fixed here at the same time.

    There are over a dozen other headers that simply declare the
    struct instead of pulling in the whole file, so follow their lead
    and simply make it a few more.

    Most of the implicit dependencies on module.h being present by
    these headers pulling it in have been now weeded out, so we can
    finally make this change with hopefully minimal breakage.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • 39aa9fddb   net: sch_generic remove redundant use of <linux/module.h> ... Browse Code »

    This file has modular references, but they are limited to
    those which are covered by the simple "struct module;"
    declaration used in dozens of other places. In fact that
    declaration is already there (just outside of the context
    of this commit) so simply remove the include line.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     
  • 4ec65b8db   net: inet_timewait_sock doesnt need <linux/module.h> ... Browse Code »

    There is nothing module specific in this header, and removing
    it doesn't seem to uncover any implicit dependencies either.
    Must be simply a vestige of an ancient legacy.

    Signed-off-by: Paul Gortmaker

    Paul Gortmaker
     

27 Oct, 2011

1 commit

  • b903d324b   ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAIT ... Browse Code »

    commit 66b13d99d96a (ipv4: tcp: fix TOS value in ACK messages sent from
    TIME_WAIT) fixed IPv4 only.

    This part is for the IPv6 side, adding a tclass param to ip6_xmit()

    We alias tw_tclass and tw_tos, if socket family is INET6.

    [ if sockets is ipv4-mapped, only IP_TOS socket option is used to fill
    TOS field, TCLASS is not taken into account ]

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     

26 Oct, 2011

1 commit

  • e33bae14f   Merge branch 'for-linus' of git://github.com/ericvh/linux ... Browse Code »

    * 'for-linus' of git://github.com/ericvh/linux:
    9p: fix 9p.txt to advertise msize instead of maxdata
    net/9p: Convert net/9p protocol dumps to tracepoints
    fs/9p: change an int to unsigned int
    fs/9p: Cleanup option parsing in 9p
    9p: move dereference after NULL check
    fs/9p: inode file operation is properly initialized init_special_inode
    fs/9p: Update zero-copy implementation in 9p

    Linus Torvalds
     

25 Oct, 2011

5 commits

  • 1805b2f04   Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net Browse Code »
    David S. Miller
     
  • 78d81d15b   TCP: remove TCP_DEBUG ... Browse Code »

    It was enabled by default and the messages guarded
    by the define are useful.

    Signed-off-by: Flavio Leitner
    Signed-off-by: David S. Miller

    Flavio Leitner
     
  • 348b59012   net/9p: Convert net/9p protocol dumps to tracepoints ... Browse Code »

    This helps in more control over debugging.
    root@qemu-img-64:~# ls /pass/123
    ls: cannot access /pass/123: No such file or directory
    root@qemu-img-64:~# cat /sys/kernel/debug/tracing/trace
    # tracer: nop
    #
    # TASK-PID CPU# TIMESTAMP FUNCTION
    # | | | | |
    ls-1536 [001] 70.928584: 9p_protocol_dump: clnt 18446612132784021504 P9_TWALK(tag = 1)
    000: 16 00 00 00 6e 01 00 01 00 00 00 02 00 00 00 01
    010: 00 03 00 31 32 33 00 00 00 ff ff ff ff 00 00 00

    ls-1536 [001] 70.928587:
    => trace_9p_protocol_dump
    => p9pdu_finalize
    => p9_client_rpc
    => p9_client_walk
    => v9fs_vfs_lookup
    => d_alloc_and_lookup
    => walk_component
    => path_lookupat
    ls-1536 [000] 70.929696: 9p_protocol_dump: clnt 18446612132784021504 P9_RLERROR(tag = 1)
    000: 0b 00 00 00 07 01 00 02 00 00 00 4e 03 00 02 00
    010: 00 00 00 00 03 00 02 00 00 00 00 00 ff 43 00 00

    ls-1536 [000] 70.929697:
    => trace_9p_protocol_dump
    => p9_client_rpc
    => p9_client_walk
    => v9fs_vfs_lookup
    => d_alloc_and_lookup
    => walk_component
    => path_lookupat
    => do_path_lookup

    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Eric Van Hensbergen

    Aneesh Kumar K.V
     
  • ef6b0807e   fs/9p: change an int to unsigned int ... Browse Code »

    Without this msize=4294967295 will result in a crash

    Signed-off-by: Dan Carpenter
    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Eric Van Hensbergen

    Dan Carpenter
     
  • abfa034e4   fs/9p: Update zero-copy implementation in 9p ... Browse Code »

    * remove lot of update to different data structure
    * add a seperate callback for zero copy request.
    * above makes non zero copy code path simpler
    * remove conditionalizing TREAD/TREADDIR/TWRITE in the zero copy path
    * Fix the dotu p9_check_errors with zero copy. Add sufficient doc around
    * Add support for both in and output buffers in zero copy callback
    * pin and unpin pages in the same context
    * use helpers instead of defining page offset and rest of page ourself
    * Fix mem leak in p9_check_errors
    * Remove 'E' and 'F' in p9pdu_vwritef

    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Eric Van Hensbergen

    Aneesh Kumar K.V
     

24 Oct, 2011

3 commits

  • 66b13d99d   ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT ... Browse Code »

    There is a long standing bug in linux tcp stack, about ACK messages sent
    on behalf of TIME_WAIT sockets.

    In the IP header of the ACK message, we choose to reflect TOS field of
    incoming message, and this might break some setups.

    Example of things that were broken :
    - Routing using TOS as a selector
    - Firewalls
    - Trafic classification / shaping

    We now remember in timewait structure the inet tos field and use it in
    ACK generation, and route lookup.

    Notes :
    - We still reflect incoming TOS in RST messages.
    - We could extend MuraliRaja Muniraju patch to report TOS value in
    netlink messages for TIME_WAIT sockets.
    - A patch is needed for IPv6

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • 318cf7aaa   tcp: md5: add more const attributes ... Browse Code »

    Now tcp_md5_hash_header() has a const tcphdr argument, we can add more
    const attributes to callers.

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • ca35a0ef8   tcp: md5: dont write skb head in tcp_md5_hash_header() ... Browse Code »

    tcp_md5_hash_header() writes into skb header a temporary zero value,
    this might confuse other users of this area.

    Since tcphdr is small (20 bytes), copy it in a temporary variable and
    make the change in the copy.

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     

22 Oct, 2011

1 commit

21 Oct, 2011

2 commits

19 Oct, 2011

4 commits