Eric Lee / smarc-fsl-linux-kernel

02 Oct, 2013

1 commit

  • 4fbef95af   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    Conflicts:
    drivers/net/ethernet/emulex/benet/be.h
    drivers/net/usb/qmi_wwan.c
    drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
    include/net/netfilter/nf_conntrack_synproxy.h
    include/net/secure_seq.h

    The conflicts are of two varieties:

    1) Conflicts with Joe Perches's 'extern' removal from header file
    function declarations. Usually it's an argument signature change
    or a function being added/removed. The resolutions are trivial.

    2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
    a new value, another changes an existing value. That sort of
    thing.

    Signed-off-by: David S. Miller

    David S. Miller
     

24 Sep, 2013

1 commit

  • 9fe34f5d9   mrp: add periodictimer to allow retries when packets get lost ... Browse Code »

    MRP doesn't implement the periodictimer in 802.1Q, so it never retries
    if packets get lost. I ran into this problem when MRP sent a MVRP
    JoinIn before the interface was fully up. The JoinIn was lost, MRP
    didn't retry, and MVRP registration failed.

    Tested against Juniper QFabric switches

    Signed-off-by: Noel Burton-Krahn
    Acked-by: David Ward
    Signed-off-by: David S. Miller

    Noel Burton-Krahn
     

22 Sep, 2013

1 commit

  • a5be1eb64   mrp.h: Remove extern from function prototypes ... Browse Code »

    There are a mix of function prototypes with and without extern
    in the kernel sources. Standardize on not using extern for
    function prototypes.

    Function prototypes don't need to be written with extern.
    extern is assumed by the compiler. Its use is as unnecessary as
    using auto to declare automatic/local variables in a block.

    Signed-off-by: Joe Perches
    Signed-off-by: David S. Miller

    Joe Perches
     

11 Feb, 2013

1 commit