1. 07 Aug, 2014 15 commits
  2. 06 Aug, 2014 12 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 85417aef
      Linus Torvalds authored
      Pull IDE cleanup from David Miller:
       "Just one minor cleanup"
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: use module_platform_driver()
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · 049711bf
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       1) Add sparc RAM output to /proc/iomem, from Bob Picco.
       2) Allow seeks on /dev/mdesc, from Khalid Aziz.
       3) Cleanup sparc64 I/O accessors, from Sam Ravnborg.
       4) If update_mmu_cache{,_pmd}() is called with an not-valid mapping, do
          not insert it into the TLB miss hash tables otherwise we'll
          livelock.  Based upon work by Christopher Alexander Tobias Schulze.
       5) Fix BREAK detection in sunsab driver when no actual characters are
          pending, from Christopher Alexander Tobias Schulze.
       6) Because we have modules --> openfirmware --> vmalloc ordering of
          virtual memory, the lazy VMAP TLB flusher can cons up an invocation
          of flush_tlb_kernel_range() that covers the openfirmware address
          range.  Unfortunately this will flush out the firmware's locked TLB
          mapping which causes all kinds of trouble.  Just split up the flush
          request if this happens, but in the long term the lazy VMAP flusher
          should probably be made a little bit smarter.
          Based upon work by Christopher Alexander Tobias Schulze.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
        sparc64: Fix up merge thinko.
        sparc: Add "install" target
        arch/sparc/math-emu/math_32.c: drop stray break operator
        sparc64: ldc_connect() should not return EINVAL when handshake is in progress.
        sparc64: Guard against flushing openfirmware mappings.
        sunsab: Fix detection of BREAK on sunsab serial console
        bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000
        sparc64: Do not insert non-valid PTEs into the TSB hash table.
        sparc64: avoid code duplication in io_64.h
        sparc64: reorder functions in io_64.h
        sparc64: drop unused SLOW_DOWN_IO definitions
        sparc64: remove macro indirection in io_64.h
        sparc64: update IO access functions in PeeCeeI
        sparcspkr: use sbus_*() primitives for IO
        sparc: Add support for seek and shorter read to /dev/mdesc
        sparc: use %s for unaligned panic
        drivers/sbus/char: Micro-optimization in display7seg.c
        display7seg: Introduce the use of the managed version of kzalloc
        sparc64 - add mem to iomem resource
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · ae045e24
      Linus Torvalds authored
      Pull networking updates from David Miller:
         1) Steady transitioning of the BPF instructure to a generic spot so
            all kernel subsystems can make use of it, from Alexei Starovoitov.
         2) SFC driver supports busy polling, from Alexandre Rames.
         3) Take advantage of hash table in UDP multicast delivery, from David
         4) Lighten locking, in particular by getting rid of the LRU lists, in
            inet frag handling.  From Florian Westphal.
         5) Add support for various RFC6458 control messages in SCTP, from
            Geir Ola Vaagland.
         6) Allow to filter bridge forwarding database dumps by device, from
            Jamal Hadi Salim.
         7) virtio-net also now supports busy polling, from Jason Wang.
         8) Some low level optimization tweaks in pktgen from Jesper Dangaard
         9) Add support for ipv6 address generation modes, so that userland
            can have some input into the process.  From Jiri Pirko.
        10) Consolidate common TCP connection request code in ipv4 and ipv6,
            from Octavian Purdila.
        11) New ARP packet logger in netfilter, from Pablo Neira Ayuso.
        12) Generic resizable RCU hash table, with intial users in netlink and
            nftables.  From Thomas Graf.
        13) Maintain a name assignment type so that userspace can see where a
            network device name came from (enumerated by kernel, assigned
            explicitly by userspace, etc.) From Tom Gundersen.
        14) Automatic flow label generation on transmit in ipv6, from Tom
        15) New packet timestamping facilities from Willem de Bruijn, meant to
            assist in measuring latencies going into/out-of the packet
            scheduler, latency from TCP data transmission to ACK, etc"
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1536 commits)
        cxgb4 : Disable recursive mailbox commands when enabling vi
        net: reduce USB network driver config options.
        tg3: Modify tg3_tso_bug() to handle multiple TX rings
        amd-xgbe: Perform phy connect/disconnect at dev open/stop
        amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask
        net: sun4i-emac: fix memory leak on bad packet
        sctp: fix possible seqlock seadlock in sctp_packet_transmit()
        Revert "net: phy: Set the driver when registering an MDIO bus device"
        cxgb4vf: Turn off SGE RX/TX Callback Timers and interrupts in PCI shutdown routine
        team: Simplify return path of team_newlink
        bridge: Update outdated comment on promiscuous mode
        net-timestamp: ACK timestamp for bytestreams
        net-timestamp: TCP timestamping
        net-timestamp: SCHED timestamp on entering packet scheduler
        net-timestamp: add key to disambiguate concurrent datagrams
        net-timestamp: move timestamp flags out of sk_flags
        net-timestamp: extend SCM_TIMESTAMPING ancillary data struct
        cxgb4i : Move stray CPL definitions to cxgb4 driver
        tcp: reduce spurious retransmits due to transient SACK reneging
        qlcnic: Initialize dcbnl_ops before register_netdev
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · f4f142ed
      Linus Torvalds authored
      Pull randomness updates from Ted Ts'o:
       "Cleanups and bug fixes to /dev/random, add a new getrandom(2) system
        call, which is a superset of OpenBSD's getentropy(2) call, for use
        with userspace crypto libraries such as LibreSSL.
        Also add the ability to have a kernel thread to pull entropy from
        hardware rng devices into /dev/random"
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes
        random: limit the contribution of the hw rng to at most half
        random: introduce getrandom(2) system call
        hw_random: fix sparse warning (NULL vs 0 for pointer)
        random: use registers from interrupted code for CPU's w/o a cycle counter
        hwrng: add per-device entropy derating
        hwrng: create filler thread
        random: add_hwgenerator_randomness() for feeding entropy from devices
        random: use an improved fast_mix() function
        random: clean up interrupt entropy accounting for archs w/o cycle counters
        random: only update the last_pulled time if we actually transferred entropy
        random: remove unneeded hash of a portion of the entropy pool
        random: always update the entropy pool under the spinlock
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · bb2cbf5e
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "In this release:
         - PKCS#7 parser for the key management subsystem from David Howells
         - appoint Kees Cook as seccomp maintainer
         - bugfixes and general maintenance across the subsystem"
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (94 commits)
        X.509: Need to export x509_request_asymmetric_key()
        netlabel: shorter names for the NetLabel catmap funcs/structs
        netlabel: fix the catmap walking functions
        netlabel: fix the horribly broken catmap functions
        netlabel: fix a problem when setting bits below the previously lowest bit
        PKCS#7: X.509 certificate issuer and subject are mandatory fields in the ASN.1
        tpm: simplify code by using %*phN specifier
        tpm: Provide a generic means to override the chip returned timeouts
        tpm: missing tpm_chip_put in tpm_get_random()
        tpm: Properly clean sysfs entries in error path
        tpm: Add missing tpm_do_selftest to ST33 I2C driver
        PKCS#7: Use x509_request_asymmetric_key()
        Revert "selinux: fix the default socket labeling in sock_graft()"
        X.509: x509_request_asymmetric_keys() doesn't need string length arguments
        PKCS#7: fix sparse non static symbol warning
        KEYS: revert encrypted key change
        ima: add support for measuring and appraising firmware
        firmware_class: perform new LSM checks
        security: introduce kernel_fw_from_file hook
        PKCS#7: Missing inclusion of linux/err.h
    • Christoph Jaeger's avatar
      ide: use module_platform_driver() · a53dae49
      Christoph Jaeger authored
      Eliminate boilerplate code by using module_platform_driver().
      Signed-off-by: default avatarChristoph Jaeger <christophjaeger@linux.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      sparc64: Fix up merge thinko. · 5b6ff9df
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · e9011d08
      David S. Miller authored
      Conflict was simple non-overlapping additions.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d247b6ab
      David S. Miller authored
      Two ipv6_table_template[] additions overlap, so the index
      of the ipv6_table[x] assignments needed to be adjusted.
      In the drivers/net/Makefile case, we've gotten rid of the
      garbage whereby we had to list every single USB networking
      driver in the top-level Makefile, there is just one
      "USB_NETWORKING" that guards everything.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e7fda6c4
      Linus Torvalds authored
      Pull timer and time updates from Thomas Gleixner:
       "A rather large update of timers, timekeeping & co
         - Core timekeeping code is year-2038 safe now for 32bit machines.
           Now we just need to fix all in kernel users and the gazillion of
           user space interfaces which rely on timespec/timeval :)
         - Better cache layout for the timekeeping internal data structures.
         - Proper nanosecond based interfaces for in kernel users.
         - Tree wide cleanup of code which wants nanoseconds but does hoops
           and loops to convert back and forth from timespecs.  Some of it
           definitely belongs into the ugly code museum.
         - Consolidation of the timekeeping interface zoo.
         - A fast NMI safe accessor to clock monotonic for tracing.  This is a
           long standing request to support correlated user/kernel space
           traces.  With proper NTP frequency correction it's also suitable
           for correlation of traces accross separate machines.
         - Checkpoint/restart support for timerfd.
         - A few NOHZ[_FULL] improvements in the [hr]timer code.
         - Code move from kernel to kernel/time of all time* related code.
         - New clocksource/event drivers from the ARM universe.  I'm really
           impressed that despite an architected timer in the newer chips SoC
           manufacturers insist on inventing new and differently broken SoC
           specific timers.
      [ Ed. "Impressed"? I don't think that word means what you think it means ]
         - Another round of code move from arch to drivers.  Looks like most
           of the legacy mess in ARM regarding timers is sorted out except for
           a few obnoxious strongholds.
         - The usual updates and fixlets all over the place"
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
        timekeeping: Fixup typo in update_vsyscall_old definition
        clocksource: document some basic timekeeping concepts
        timekeeping: Use cached ntp_tick_length when accumulating error
        timekeeping: Rework frequency adjustments to work better w/ nohz
        timekeeping: Minor fixup for timespec64->timespec assignment
        ftrace: Provide trace clocks monotonic
        timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC
        seqcount: Add raw_write_seqcount_latch()
        seqcount: Provide raw_read_seqcount()
        timekeeping: Use tk_read_base as argument for timekeeping_get_ns()
        timekeeping: Create struct tk_read_base and use it in struct timekeeper
        timekeeping: Restructure the timekeeper some more
        clocksource: Get rid of cycle_last
        clocksource: Move cycle_last validation to core code
        clocksource: Make delta calculation a function
        wireless: ath9k: Get rid of timespec conversions
        drm: vmwgfx: Use nsec based interfaces
        drm: i915: Use nsec based interfaces
        timekeeping: Provide ktime_get_raw()
        hangcheck-timer: Use ktime_get_ns()
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 08d69a25
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "Nothing spectacular from the irq department this time:
         - overhaul of the crossbar chip driver
         - overhaul of the spear shirq chip driver
         - support for the atmel-aic chip
         - code move from arch to drivers
         - the usual tiny fixlets
         - two reverts worth to mention which undo the too simple attempt of
           supporting wakeup interrupts on shared interrupt lines"
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (41 commits)
        Revert "irq: Warn when shared interrupts do not match on NO_SUSPEND"
        Revert "PM / sleep / irq: Do not suspend wakeup interrupts"
        irq: Warn when shared interrupts do not match on NO_SUSPEND
        irqchip: atmel-aic: Define irq fixups for atmel SoCs
        irqchip: atmel-aic: Implement RTC irq fixup
        irqchip: atmel-aic: Add irq fixup infrastructure
        irqchip: atmel-aic: Add atmel AIC/AIC5 drivers
        irqchip: atmel-aic: Move binding doc to interrupt-controller directory
        genirq: generic chip: Export irq_map_generic_chip function
        PM / sleep / irq: Do not suspend wakeup interrupts
        irqchip: or1k-pic: Migrate from arch/openrisc/
        irqchip: crossbar: Allow for quirky hardware with direct hardwiring of GIC
        documentation: dt: omap: crossbar: Add description for interrupt consumer
        irqchip: crossbar: Introduce centralized check for crossbar write
        irqchip: crossbar: Introduce ti, max-crossbar-sources to identify valid crossbar mapping
        irqchip: crossbar: Add kerneldoc for crossbar_domain_unmap callback
        irqchip: crossbar: Set cb pointer to null in case of error
        irqchip: crossbar: Change the goto naming
        irqchip: crossbar: Return proper error value
        irqchip: crossbar: Fix kerneldoc warning
    • Thomas Gleixner's avatar
      x86: MCE: Add raw_lock conversion again · ed5c41d3
      Thomas Gleixner authored
      Commit ea431643 ("x86/mce: Fix CMCI preemption bugs") breaks RT by
      the completely unrelated conversion of the cmci_discover_lock to a
      regular (non raw) spinlock.  This lock was annotated in commit
      59d958d2 ("locking, x86: mce: Annotate cmci_discover_lock as raw")
      with a proper explanation why.
      The argument for converting the lock back to a regular spinlock was:
       - it does percpu ops without disabling preemption. Preemption is not
         disabled due to the mistaken use of a raw spinlock.
      Which is complete nonsense.  The raw_spinlock is disabling preemption in
      the same way as a regular spinlock.  In mainline spinlock maps to
      raw_spinlock, in RT spinlock becomes a "sleeping" lock.
      raw_spinlock has on RT exactly the same semantics as in mainline.  And
      because this lock is taken in non preemptible context it must be raw on
      Undo the locking brainfart.
      Reported-by: default avatarClark Williams <williams@redhat.com>
      Reported-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  3. 05 Aug, 2014 13 commits
    • Anish Bhatt's avatar
      cxgb4 : Disable recursive mailbox commands when enabling vi · 30f00847
      Anish Bhatt authored
      Enabling a Virtual Interface can result in an interrupt during the processing
       of the VI Enable command and, in some paths, result in an attempt to issue
      another command in the interrupt context, eventually crashing the system. Thus,
       we disable interrupts during the course of the VI Enable command and ensure
      enable doesn't sleep.
      Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
      Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Francois Romieu's avatar
      net: reduce USB network driver config options. · 1bb5a356
      Francois Romieu authored
      USB network drivers are already handled in drivers/net/usb/Kconfig.
      Let's save the maintenance burden of dependencies in drivers/net/Makefile.
      The newly introduced USB_NET_DRIVERS umbrella config option defaults
      to 'y' so as to minimize the changes of behavior.
      Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Prashant Sreedharan's avatar
      tg3: Modify tg3_tso_bug() to handle multiple TX rings · 4d8fdc95
      Prashant Sreedharan authored
      tg3_tso_bug() was originally designed to handle only HW TX ring 0, Commit
      d3f6f3a1 ("tg3: Prevent page allocation failure
      during TSO workaround") changed the driver logic to use tg3_tso_bug() for all
      HW TX rings that are enabled. This patch fixes the regression by modifying
      tg3_tso_bug() to handle multiple HW TX rings.
      Signed-off-by: default avatarPrashant Sreedharan <prashant@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge branch 'amd-xgbe' · 0ca58d62
      David S. Miller authored
      Tom Lendacky says:
      amd-xgbe: AMD XGBE driver update 2014-08-05
      The following series of patches includes fixes/updates to the driver.
      - Use dma_set_mask_and_coherent to set the DMA mask
      - Move the phy connect/disconnect logic to allow for module unloading
      Changes in V2:
      - Check the return value of the dma_set_mask_and_coherent call
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Lendacky, Thomas's avatar
      amd-xgbe: Perform phy connect/disconnect at dev open/stop · 88131a81
      Lendacky, Thomas authored
      A change added to the mdiobus/phy api added a module_get/module_put
      during phy connect/disconnect processing. Currently, the driver
      performs a phy connect during module probe and a phy disconnect during
      module remove. With the addition of the module_get during phy connect
      the amd-xgbe module use count is incremented and can no longer be
      Move the phy connect/disconnect from the driver probe/remove functions
      to the net_device_ops ndo_open/ndo_stop functions.  This allows the
      module use count to be decremented when the device(s) are brought down
      and allows the module to be unloaded.
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Lendacky, Thomas's avatar
      amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask · f3d0e78d
      Lendacky, Thomas authored
      Use the dma_set_mask_and_coherent function to set the DMA mask rather
      than setting the DMA mask fields directly.  This was originally done
      to work around a bug in the arm64 DMA support when RAM started above
      the 4GB boundary which has since been fixed.
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Marc Zyngier's avatar
      net: sun4i-emac: fix memory leak on bad packet · 2670cc69
      Marc Zyngier authored
      Upon reception of a new frame, the emac driver checks for a number
      of error conditions, and flag the packet as "bad" if any of these
      are present. It then allocates a skb unconditionally, but only uses
      it if the packet is "good". On the error path, the skb is just forgotten,
      and the system leaks memory.
      The piece of junk I have on my desk seems to encounter such error
      frequently enough so that the box goes OOM after a couple of days,
      which makes me grumpy.
      Fix this by moving the allocation on the "good_packet" path (and
      convert it to netdev_alloc_skb while we're at it).
      Tested on a random Allwinner A20 board.
      Cc: Stefan Roese <sr@denx.de>
      Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
      Cc: <stable@vger.kernel.org> # 3.11+
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Eric Dumazet's avatar
      sctp: fix possible seqlock seadlock in sctp_packet_transmit() · 757efd32
      Eric Dumazet authored
      Dave reported following splat, caused by improper use of
      IP_INC_STATS_BH() in process context.
      BUG: using __this_cpu_add() in preemptible [00000000] code: trinity-c117/14551
      caller is __this_cpu_preempt_check+0x13/0x20
      CPU: 3 PID: 14551 Comm: trinity-c117 Not tainted 3.16.0+ #33
       ffffffff9ec898f0 0000000047ea7e23 ffff88022d32f7f0 ffffffff9e7ee207
       0000000000000003 ffff88022d32f818 ffffffff9e397eaa ffff88023ee70b40
       ffff88022d32f970 ffff8801c026d580 ffff88022d32f828 ffffffff9e397ee3
      Call Trace:
       [<ffffffff9e7ee207>] dump_stack+0x4e/0x7a
       [<ffffffff9e397eaa>] check_preemption_disabled+0xfa/0x100
       [<ffffffff9e397ee3>] __this_cpu_preempt_check+0x13/0x20
       [<ffffffffc0839872>] sctp_packet_transmit+0x692/0x710 [sctp]
       [<ffffffffc082a7f2>] sctp_outq_flush+0x2a2/0xc30 [sctp]
       [<ffffffff9e0d985c>] ? mark_held_locks+0x7c/0xb0
       [<ffffffff9e7f8c6d>] ? _raw_spin_unlock_irqrestore+0x5d/0x80
       [<ffffffffc082b99a>] sctp_outq_uncork+0x1a/0x20 [sctp]
       [<ffffffffc081e112>] sctp_cmd_interpreter.isra.23+0x1142/0x13f0 [sctp]
       [<ffffffffc081c86b>] sctp_do_sm+0xdb/0x330 [sctp]
       [<ffffffff9e0b8f1b>] ? preempt_count_sub+0xab/0x100
       [<ffffffffc083b350>] ? sctp_cname+0x70/0x70 [sctp]
       [<ffffffffc08389ca>] sctp_primitive_ASSOCIATE+0x3a/0x50 [sctp]
       [<ffffffffc083358f>] sctp_sendmsg+0x88f/0xe30 [sctp]
       [<ffffffff9e0d673a>] ? lock_release_holdtime.part.28+0x9a/0x160
       [<ffffffff9e0d62ce>] ? put_lock_stats.isra.27+0xe/0x30
       [<ffffffff9e73b624>] inet_sendmsg+0x104/0x220
       [<ffffffff9e73b525>] ? inet_sendmsg+0x5/0x220
       [<ffffffff9e68ac4e>] sock_sendmsg+0x9e/0xe0
       [<ffffffff9e1c0c09>] ? might_fault+0xb9/0xc0
       [<ffffffff9e1c0bae>] ? might_fault+0x5e/0xc0
       [<ffffffff9e68b234>] SYSC_sendto+0x124/0x1c0
       [<ffffffff9e0136b0>] ? syscall_trace_enter+0x250/0x330
       [<ffffffff9e68c3ce>] SyS_sendto+0xe/0x10
       [<ffffffff9e7f9be4>] tracesys+0xdd/0xe2
      This is a followup of commits f1d8cba6 ("inet: fix possible
      seqlock deadlocks") and 7f88c6b2 ("ipv6: fix possible seqlock
      deadlock in ip6_finish_output2")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Fabio Estevam's avatar
      Revert "net: phy: Set the driver when registering an MDIO bus device" · ce7991e8
      Fabio Estevam authored
      Commit a71e3c37 ("net: phy: Set the driver when registering an MDIO bus
      device") caused the following regression on the fec driver:
      root@imx6qsabresd:~# echo mem > /sys/power/state
      PM: Syncing filesystems ... done.
      Freezing user space processes ... (elapsed 0.003 seconds) done.
      Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done.
      Unable to handle kernel NULL pointer dereference at virtual address 0000002c
      pgd = bcd14000
      [0000002c] *pgd=4d9e0831, *pte=00000000, *ppte=00000000
      Internal error: Oops: 17 [#1] SMP ARM
      Modules linked in:
      CPU: 0 PID: 617 Comm: sh Not tainted 3.16.0 #17
      task: bc0c4e00 ti: bceb6000 task.ti: bceb6000
      PC is at fec_suspend+0x10/0x70
      LR is at dpm_run_callback.isra.7+0x34/0x6c
      pc : [<803f8a98>]    lr : [<80361f44>]    psr: 600f0013
      sp : bceb7d70  ip : bceb7d88  fp : bceb7d84
      r10: 8091523c  r9 : 00000000  r8 : bd88f478
      r7 : 803f8a88  r6 : 81165988  r5 : 00000000  r4 : 00000000
      r3 : 00000000  r2 : 00000000  r1 : bd88f478  r0 : bd88f478
      Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
      Control: 10c5387d  Table: 4cd1404a  DAC: 00000015
      Process sh (pid: 617, stack limit = 0xbceb6240)
      Stack: (0xbceb7d70 to 0xbceb8000)
      The problem with the original commit is explained by Russell King:
      "It has the effect (as can be seen from the oops) of attaching the MDIO bus
      device (itself is a bus-less device) to the platform driver, which means
      that if the platform driver supports power management, it will be called
      to power manage the MDIO bus device.
      Moreover, drivers do not expect to be called for power management
      operations for devices which they haven't probed, and certainly not for
      devices which aren't part of the same bus that the driver is registered
      This reverts commit a71e3c37.
      Cc: <stable@vger.kernel.org> #3.16
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      cxgb4vf: Turn off SGE RX/TX Callback Timers and interrupts in PCI shutdown routine · c2a19856
      Hariprasad Shenai authored
      Need to turn off  SGE RX/TX Callback Timers & interrupt in cxgb4vf PCI Shutdown
      routine in order to prevent crashes during reboot/poweroff when traffic is
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · 6ff4e36f
      David S. Miller authored
      Antonio Quartulli says:
      pull request: batman-adv 2014-08-05
      this is a pull request intended for net-next/linux-3.17 (yeah..it's really
      Patches 1, 2 and 4 are really minor changes:
      - kmalloc_array is substituted to kmalloc when possible (as suggested by
      - net_ratelimited() is now used properly and the "suppressed" message is not
        printed anymore if not needed;
      - the internal version number has been increased to reflect our current version.
      Patch 3 instead is introducing a change in the metric computation function
      by changing the penalty applied at each mesh hop from 15/255 (~6%) to
      30/255 (~11%). This change is introduced by Simon Wunderlich after having
      observed a performance improvement in several networks when using the new value.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Toshiaki Makita's avatar
      team: Simplify return path of team_newlink · ff204cce
      Toshiaki Makita authored
      The variable "err" is not necessary.
      Return register_netdevice() directly.
      Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
      Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Toshiaki Makita's avatar
      bridge: Update outdated comment on promiscuous mode · fdb0a662
      Toshiaki Makita authored
      Now bridge ports can be non-promiscuous, vlan_vid_add() is no longer an
      unnecessary operation.
      Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>