1. 11 Mar, 2015 2 commits
    • Herbert Xu's avatar
      rhashtable: Move hash_rnd into bucket_table · 988dfbd7
      Herbert Xu authored
      Currently hash_rnd is a parameter that users can set.  However,
      no existing users set this parameter.  It is also something that
      people are unlikely to want to set directly since it's just a
      random number.
      
      In preparation for allowing the reseeding/rehashing of rhashtable,
      this patch moves hash_rnd into bucket_table so that it's now an
      internal state rather than a parameter.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      988dfbd7
    • Alexander Duyck's avatar
      ipv4: FIB Local/MAIN table collapse · 0ddcf43d
      Alexander Duyck authored
      This patch is meant to collapse local and main into one by converting
      tb_data from an array to a pointer.  Doing this allows us to point the
      local table into the main while maintaining the same variables in the
      table.
      
      As such the tb_data was converted from an array to a pointer, and a new
      array called data is added in order to still provide an object for tb_data
      to point to.
      
      In order to track the origin of the fib aliases a tb_id value was added in
      a hole that existed on 64b systems.  Using this we can also reverse the
      merge in the event that custom FIB rules are enabled.
      
      With this patch I am seeing an improvement of 20ns to 30ns for routing
      lookups as long as custom rules are not enabled, with custom rules enabled
      we fall back to split tables and the original behavior.
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0ddcf43d
  2. 10 Mar, 2015 31 commits
    • Jon Paul Maloy's avatar
      tipc: ensure that idle links are deleted when a bearer is disabled · 169bf912
      Jon Paul Maloy authored
      commit afaa3f65
      (tipc: purge links when bearer is disabled) was an attempt to resolve
      a problem that turned out to have a more profound reason.
      
      When we disable a bearer, we delete all its pertaining links if
      there is no other bearer to perform failover to, or if the module
      is shutting down. In case there are dual bearers, we wait with
      deleting links until the failover procedure is finished.
      
      However, this misses the case when a link on the removed bearer
      was already down, so that there will be no failover procedure to
      finish the link delete. This causes confusion if a new bearer is
      added to replace the removed one, and also entails a small memory
      leak.
      
      This commit takes the current state of the link into account when
      deciding when to delete it, and also reverses the above-mentioned
      commit.
      Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      169bf912
    • Alexander Duyck's avatar
      fib_trie: Address possible NULL pointer dereference in resize · ddb4b9a1
      Alexander Duyck authored
      If the inflate call failed it would return NULL.  As a result tp would be
      set to NULL and cause use to trigger a NULL pointer dereference in
      should_halve if the inflate failed on the first attempt.
      
      In order to prevent this we should decrement max_work before we actually
      attempt to inflate as this will force us to exit before attempting to halve
      a node we should have inflated.  In order to keep things symmetric between
      inflate and halve I went ahead and also moved the decrement of max_work for
      the halve case as well so we take care of that before we actually attempt
      to halve the tnode.
      
      Fixes: 88bae714 ("fib_trie: Add key vector to root, return parent key_vector in resize")
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ddb4b9a1
    • Stephen Rothwell's avatar
      macb: Fix merge error. · 416377ea
      Stephen Rothwell authored
      The code removed by commit 421d9df0 ("net/macb: merge
      at91_ether driver into macb driver") should be removed
      in the merge resolution as well.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      416377ea
    • Alexander Duyck's avatar
      fib_trie: Correctly handle case of key == 0 in leaf_walk_rcu · 3ec320dd
      Alexander Duyck authored
      In the case of a trie that had no tnodes with a key of 0 the initial
      look-up would fail resulting in an out-of-bounds cindex on the first tnode.
      This resulted in an entire trie being skipped.
      
      In order resolve this I have updated the cindex logic in the initial
      look-up so that if the key is zero we will always traverse the child zero
      path.
      
      Fixes: 8be33e95 ("fib_trie: Fib walk rcu should take a tnode and key instead of a trie and a leaf")
      Reported-by: default avatarSabrina Dubroca <sd@queasysnail.net>
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
      Tested-by: default avatarSabrina Dubroca <sd@queasysnail.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3ec320dd
    • David S. Miller's avatar
      Merge branch 'inet_diag_cleanups' · 7c23aaf2
      David S. Miller authored
      Eric Dumazet says:
      
      ====================
      inet_diag: cleanups and improvements
      
      Before changing way request socks are dumped, let's clean up this code
      a bit.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7c23aaf2
    • Eric Dumazet's avatar
      inet_diag: add const to inet_diag_req_v2 · 34160ea3
      Eric Dumazet authored
      diag dumpers should not modify the request.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      34160ea3
    • Eric Dumazet's avatar
      inet_diag: cleanups · e31c5e0e
      Eric Dumazet authored
      Remove all inline keywords, add some const, and cleanup style.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e31c5e0e
    • Eric Dumazet's avatar
      net: constify sock_diag_check_cookie() · 491da2a4
      Eric Dumazet authored
      sock_diag_check_cookie() second parameter is constant
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      491da2a4
    • Florian Westphal's avatar
      drivers: atm: nicstar: remove ifdef'd out skb destructors · 3855634d
      Florian Westphal authored
      remove dead code.
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3855634d
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 515fb5c3
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net-next
      
      The following batch contains a couple of fixes to address some fallout
      from the previous pull request, they are:
      
      1) Address link problems in the bridge code after e5de75bf. Fix it by
         using rcu hook to address to avoid ifdef pollution and hard
         dependency between bridge and br_netfilter.
      
      2) Address sparse warnings in the netfilter reject code, patch from
         Florian Westphal.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      515fb5c3
    • Pablo Neira Ayuso's avatar
      netfilter: bridge: use rcu hook to resolve br_netfilter dependency · 1a4ba64d
      Pablo Neira Ayuso authored
      e5de75bf ("netfilter: bridge: move DNAT helper to br_netfilter") results
      in the following link problem:
      
      net/bridge/br_device.c:29: undefined reference to `br_nf_prerouting_finish_bridge`
      
      Moreover it creates a hard dependency between br_netfilter and the
      bridge core, which is what we've been trying to avoid so far.
      
      Resolve this problem by using a hook structure so we reduce #ifdef
      pollution and keep bridge netfilter specific code under br_netfilter.c
      which was the original intention.
      Reported-by: default avatarSimon Horman <simon.horman@netronome.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      1a4ba64d
    • Florian Westphal's avatar
      netfilter: fix sparse warnings in reject handling · a03a8dbe
      Florian Westphal authored
      make C=1 CF=-D__CHECK_ENDIAN__ shows following:
      
      net/bridge/netfilter/nft_reject_bridge.c:65:50: warning: incorrect type in argument 3 (different base types)
      net/bridge/netfilter/nft_reject_bridge.c:65:50:    expected restricted __be16 [usertype] protocol [..]
      net/bridge/netfilter/nft_reject_bridge.c:102:37: warning: cast from restricted __be16
      net/bridge/netfilter/nft_reject_bridge.c:102:37: warning: incorrect type in argument 1 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:121:50: warning: incorrect type in argument 3 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:168:52: warning: incorrect type in argument 3 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:233:52: warning: incorrect type in argument 3 (different base types) [..]
      
      Caused by two (harmless) errors:
      1. htons() instead of ntohs()
      2. __be16 for protocol in nf_reject_ipXhdr_put API, use u8 instead.
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      a03a8dbe
    • Florian Fainelli's avatar
      net: phy: bcm7xxx: add alternate id for 7439 · 59e33c2b
      Florian Fainelli authored
      BCM7439 has an alternate PHY OUI: 0xae025080 which is to be found in
      some variants of this chip.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      59e33c2b
    • Scott Feldman's avatar
      switchdev: add netlink flags to IPv4 FIB add op · f8f21471
      Scott Feldman authored
      Pass in the netlink flags (NLM_F_*) into switchdev driver for IPv4 FIB add op
      to allow driver to 1) optimize hardware updates, 2) handle ip route prepend
      and append commands correctly.
      Suggested-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      Suggested-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
      Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
      Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8f21471
    • David S. Miller's avatar
      Merge branch 'dsa-next' · bf0b2112
      David S. Miller authored
      Florian Fainelli says:
      
      ====================
      net: dsa: remove restriction on platform_device
      
      This patch series removes the restriction in DSA to operate exclusively with
      platform_device Ethernet MAC drivers when using Device Tree. This basically
      allows arbitrary Ethernet MAC drivers to be used now in conjunction with
      Device Tree.
      
      The reason was that DSA was using a of_find_device_by_node() which limits
      the device_node to device pointer search exclusively to platform_device,
      in our case, we are interested in doing a "class" research and lookup the
      net_device.
      
      Thanks to Chris Packham for testing this on his platform.
      
      Changes in v2:
      
      - fix build for !CONFIG_OF_NET
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bf0b2112
    • Florian Fainelli's avatar
      net: dsa: utilize of_find_net_device_by_node · 769a0202
      Florian Fainelli authored
      Using of_find_device_by_node() restricts the search to platform_device that
      match the specified device_node pointer. This is not even remotely true for
      network devices backed by a pci_device for instance.
      
      of_find_net_device_by_node() allows us to do a more thorough lookup to find the
      struct net_device corresponding to a particular device_node pointer.
      
      For symetry with the non-OF code path, we hold the net_device pointer in
      dsa_probe() just like what dev_to_net_dev() does when we call this
      function.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      769a0202
    • Florian Fainelli's avatar
      net: core: add of_find_net_device_by_node() · aa836df9
      Florian Fainelli authored
      Add a helper function which allows getting the struct net_device pointer
      associated with a given struct device_node pointer. This is useful for
      instance for DSA Ethernet devices not backed by a platform_device, but a PCI
      device.
      
      Since we need to access net_class which is not accessible outside of
      net/core/net-sysfs.c, this helper function is also added here and gated
      with CONFIG_OF_NET.
      
      Network devices initialized with SET_NETDEV_DEV() are also taken into
      account by checking for dev->parent first and then falling back to
      checking the device pointer within struct net_device.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa836df9
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 3cef5c5b
      David S. Miller authored
      Conflicts:
      	drivers/net/ethernet/cadence/macb.c
      
      Overlapping changes in macb driver, mostly fixes and cleanups
      in 'net' overlapping with the integration of at91_ether into
      macb in 'net-next'.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3cef5c5b
    • Petri Gynther's avatar
      net: bcmgenet: core changes for supporting multiple Rx queues · 8ac467e8
      Petri Gynther authored
      1. Add struct bcmgenet_rx_ring to hold all necessary information
         for a single Rx queue.
      2. Add bcmgenet_init_rx_queues() to initialize all Rx queues.
      3. Modify bcmgenet_init_rx_ring() to initialize a single Rx queue.
      4. Modify Rx interrupt path code to use per-queue data.
      5. Modify bcmgenet_rx_refill() to use RxCB->bd_addr.
      Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8ac467e8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · affb8172
      Linus Torvalds authored
      Pull kvm/s390 bugfixes from Marcelo Tosatti.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: s390: non-LPAR case obsolete during facilities mask init
        KVM: s390: include guest facilities in kvm facility test
        KVM: s390: fix in memory copy of facility lists
        KVM: s390/cpacf: Fix kernel bug under z/VM
        KVM: s390/cpacf: Enable key wrapping by default
      affb8172
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · ec0e6bd3
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       "One performance optimization for page_clear and a couple of bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mm: fix incorrect ASCE after crst_table_downgrade
        s390/ftrace: fix crashes when switching tracers / add notrace to cpu_relax()
        s390/pci: unify pci_iomap symbol exports
        s390/pci: fix [un]map_resources sequence
        s390: let the compiler do page clearing
        s390/pci: fix possible information leak in mmio syscall
        s390/dcss: array index 'i' is used before limits check.
        s390/scm_block: fix off by one during cluster reservation
        s390/jump label: improve and fix sanity check
        s390/jump label: add missing jump_label_apply_nops() call
      ec0e6bd3
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v4.0-rc2-2' of... · e7901af1
      Linus Torvalds authored
      Merge tag 'trace-fixes-v4.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull seq-buf/ftrace fixes from Steven Rostedt:
       "This includes fixes for seq_buf_bprintf() truncation issue.  It also
        contains fixes to ftrace when /proc/sys/kernel/ftrace_enabled and
        function tracing are started.  Doing the following causes some issues:
      
          # echo 0 > /proc/sys/kernel/ftrace_enabled
          # echo function_graph > /sys/kernel/debug/tracing/current_tracer
          # echo 1 > /proc/sys/kernel/ftrace_enabled
          # echo nop > /sys/kernel/debug/tracing/current_tracer
          # echo function_graph > /sys/kernel/debug/tracing/current_tracer
      
        As well as with function tracing too.  Pratyush Anand first reported
        this issue to me and supplied a patch.  When I tested this on my x86
        test box, it caused thousands of backtraces and warnings to appear in
        dmesg, which also caused a denial of service (a warning for every
        function that was listed).  I applied Pratyush's patch but it did not
        fix the issue for me.  I looked into it and found a slight problem
        with trampoline accounting.  I fixed it and sent Pratyush a patch, but
        he said that it did not fix the issue for him.
      
        I later learned tha Pratyush was using an ARM64 server, and when I
        tested on my ARM board, I was able to reproduce the same issue as
        Pratyush.  After applying his patch, it fixed the problem.  The above
        test uncovered two different bugs, one in x86 and one in ARM and
        ARM64.  As this looked like it would affect PowerPC, I tested it on my
        PPC64 box.  It too broke, but neither the patch that fixed ARM or x86
        fixed this box (the changes were all in generic code!).  The above
        test, uncovered two more bugs that affected PowerPC.  Again, the
        changes were only done to generic code.  It's the way the arch code
        expected things to be done that was different between the archs.  Some
        where more sensitive than others.
      
        The rest of this series fixes the PPC bugs as well"
      
      * tag 'trace-fixes-v4.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled
        ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl
        ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl
        seq_buf: Fix seq_buf_bprintf() truncation
        seq_buf: Fix seq_buf_vprintf() truncation
      e7901af1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 36bef883
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) nft_compat accidently truncates ethernet protocol to 8-bits, from
          Arturo Borrero.
      
       2) Memory leak in ip_vs_proc_conn(), from Julian Anastasov.
      
       3) Don't allow the space required for nftables rules to exceed the
          maximum value representable in the dlen field.  From Patrick
          McHardy.
      
       4) bcm63xx_enet can accidently leave interrupts permanently disabled
          due to errors in the NAPI polling exit logic.  Fix from Nicolas
          Schichan.
      
       5) Fix OOPSes triggerable by the ping protocol module, due to missing
          address family validations etc.  From Lorenzo Colitti.
      
       6) Don't use RCU locking in sleepable context in team driver, from Jiri
          Pirko.
      
       7) xen-netback miscalculates statistic offset pointers when reporting
          the stats to userspace.  From David Vrabel.
      
       8) Fix a leak of up to 256 pages per VIF destroy in xen-netaback, also
          from David Vrabel.
      
       9) ip_check_defrag() cannot assume that skb_network_offset(),
          particularly when it is used by the AF_PACKET fanout defrag code.
          From Alexander Drozdov.
      
      10) gianfar driver doesn't query OF node names properly when trying to
          determine the number of hw queues available.  Fix it to explicitly
          check for OF nodes named queue-group.  From Tobias Waldekranz.
      
      11) MID field in macb driver should be 12 bits, not 16.  From Punnaiah
          Choudary Kalluri.
      
      12) Fix unintentional regression in traceroute due to timestamp socket
          option changes.  Empty ICMP payloads should be allowed in
          non-timestamp cases.  From Willem de Bruijn.
      
      13) When devices are unregistered, we have to get rid of AF_PACKET
          multicast list entries that point to it via ifindex.  Fix from
          Francesco Ruggeri.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
        tipc: fix bug in link failover handling
        net: delete stale packet_mclist entries
        net: macb: constify macb configuration data
        MAINTAINERS: add Marc Kleine-Budde as co maintainer for CAN networking layer
        MAINTAINERS: linux-can moved to github
        can: kvaser_usb: Read all messages in a bulk-in URB buffer
        can: kvaser_usb: Avoid double free on URB submission failures
        can: peak_usb: fix missing ctrlmode_ init for every dev
        can: add missing initialisations in CAN related skbuffs
        ip: fix error queue empty skb handling
        bgmac: Clean warning messages
        tcp: align tcp_xmit_size_goal() on tcp_tso_autosize()
        net: fec: fix unbalanced clk disable on driver unbind
        net: macb: Correct the MID field length value
        net: gianfar: correctly determine the number of queue groups
        ipv4: ip_check_defrag should not assume that skb_network_offset is zero
        net: bcmgenet: properly disable password matching
        net: eth: xgene: fix booting with devicetree
        bnx2x: Force fundamental reset for EEH recovery
        xen-netback: refactor xenvif_handle_frag_list()
        ...
      36bef883
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · e93df634
      Linus Torvalds authored
      Pull input subsystem fixes from Dmitry Torokhov:
       "Miscellaneous driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: psmouse - disable "palm detection" in the focaltech driver
        Input: psmouse - disable changing resolution/rate/scale for FocalTech
        Input: psmouse - ensure that focaltech reports consistent coordinates
        Input: psmouse - remove hardcoded touchpad size from the focaltech driver
        Input: tc3589x-keypad - set IRQF_ONESHOT flag to ensure IRQ request
        Input: ALPS - fix memory leak when detection fails
        Input: sun4i-ts - add thermal driver dependency
        Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()
        Input: cyapa - fix unaligned functions redefinition error
        Input: mma8450 - add parent device
      e93df634
    • Linus Torvalds's avatar
      Merge tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 068c65c5
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "A couple of driver specific fixes plus a fix for a regression in the
        core where the updates to use sysfs group registration were overly
        enthusiastic in eliding properties and removed some that had been
        previously present"
      
      * tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Fix regression due to NULL constraints check
        regulator: rk808: Set the enable time for LDOs
        regulator: da9210: Mask all interrupt sources to deassert interrupt line
      068c65c5
    • Linus Torvalds's avatar
      Merge tag 'spi-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · d08edd8f
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A collection of driver specific fixes to which the usual comments
        about them being important if you see them mostly apply (except for
        the comment fix).  The pl022 one is particularly nasty for anyone
        affected by it"
      
      * tag 'spi-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: pl022: Fix race in giveback() leading to driver lock-up
        spi: dw-mid: avoid potential NULL dereference
        spi: img-spfi: Verify max spfi transfer length
        spi: fix a typo in comment.
        spi: atmel: Fix interrupt setup for PDC transfers
        spi: dw: revisit FIFO size detection again
        spi: dw-pci: correct number of chip selects
        drivers: spi: ti-qspi: wait for busy bit clear before data write/read
      d08edd8f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · eca8dac4
      Linus Torvalds authored
      Pull tpm fixes from James Morris:
       "fixes for the TPM driver"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        tpm: fix call order in tpm-chip.c
        tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send
      eca8dac4
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · ecddad64
      Linus Torvalds authored
      Pull fbdev fixes from Tomi Valkeinen:
       - Fix regression in with omapdss when using i2c displays
       - Fix possible null deref in fbmon
       - Check kalloc return value in AMBA CLCD
      
      * tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        OMAPDSS: fix regression with display sysfs files
        video: fbdev: fix possible null dereference
        video: ARM CLCD: Add missing error check for devm_kzalloc
      ecddad64
    • Linus Torvalds's avatar
      Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · c0e99a71
      Linus Torvalds authored
      Pull cgroup fixes from Tejun Heo:
       "The cgroup iteration update two years ago and the recent cpuset
        restructuring introduced regressions in subset of cpuset
        configurations.  Three patches to fix them.
      
        All are marked for -stable"
      
      * 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cpuset: Fix cpuset sched_relax_domain_level
        cpuset: fix a warning when clearing configured masks in old hierarchy
        cpuset: initialize effective masks when clone_children is enabled
      c0e99a71
    • Linus Torvalds's avatar
      Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · f930713b
      Linus Torvalds authored
      Pull libata fixlet from Tejun Heo:
       "Speed limiting fix for sata_fsl"
      
      * 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        sata-fsl: Apply link speed limits
      f930713b
    • Linus Torvalds's avatar
      Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · b695f31f
      Linus Torvalds authored
      Pull workqueue fix from Tejun Heo:
       "One fix patch for a subtle livelock condition which can happen on
        PREEMPT_NONE kernels involving two racing cancel_work calls.  Whoever
        comes in the second has to wait for the previous one to finish.  This
        was implemented by making the later one block for the same condition
        that the former would be (work item completion) and then loop and
        retest; unfortunately, depending on the wake up order, the later one
        could lock out the former one to finish by busy looping on the cpu.
      
        This is fixed by implementing explicit wait mechanism.  Work item
        might not belong anywhere at this point and there's remote possibility
        of thundering herd problem.  I originally tried to use bit_waitqueue
        but it didn't work for static work items on modules.  It's currently
        using single wait queue with filtering wake up function and exclusive
        wakeup.  If this ever becomes a problem, which is not very likely, we
        can try to figure out a way to piggy back on bit_waitqueue"
      
      * 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
      b695f31f
  3. 09 Mar, 2015 7 commits
    • Jon Paul Maloy's avatar
      tipc: fix bug in link failover handling · e6441bae
      Jon Paul Maloy authored
      In commit c637c103
      ("tipc: resolve race problem at unicast message reception") we
      introduced a new mechanism for delivering buffers upwards from link
      to socket layer.
      
      That code contains a bug in how we handle the new link input queue
      during failover. When a link is reset, some of its users may be blocked
      because of congestion, and in order to resolve this, we add any pending
      wakeup pseudo messages to the link's input queue, and deliver them to
      the socket. This misses the case where the other, remaining link also
      may have congested users. Currently, the owner node's reference to the
      remaining link's input queue is unconditionally overwritten by the
      reset link's input queue. This has the effect that wakeup events from
      the remaining link may be unduely delayed (but not lost) for a
      potentially long period.
      
      We fix this by adding the pending events from the reset link to the
      input queue that is currently referenced by the node, whichever one
      it is.
      
      This commit should be applied to both net and net-next.
      Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e6441bae
    • Francesco Ruggeri's avatar
      net: delete stale packet_mclist entries · 82f17091
      Francesco Ruggeri authored
      When an interface is deleted from a net namespace the ifindex in the
      corresponding entries in PF_PACKET sockets' mclists becomes stale.
      This can create inconsistencies if later an interface with the same ifindex
      is moved from a different namespace (not that unlikely since ifindexes are
      per-namespace).
      In particular we saw problems with dev->promiscuity, resulting
      in "promiscuity touches roof, set promiscuity failed. promiscuity
      feature of device might be broken" warnings and EOVERFLOW failures of
      setsockopt(PACKET_ADD_MEMBERSHIP).
      This patch deletes the mclist entries for interfaces that are deleted.
      Since this now causes setsockopt(PACKET_DROP_MEMBERSHIP) to fail with
      EADDRNOTAVAIL if called after the interface is deleted, also make
      packet_mc_drop not fail.
      Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      82f17091
    • Jon Paul Maloy's avatar
      tipc: Add Ying Xue to TIPC maintainers list · 115403df
      Jon Paul Maloy authored
      We remove Allan Stephens, who has moved on to other tasks, from
      the TIPC maintainers list. He is replaced by Ying Xue, who has
      been doing the maintenance on behalf of WindRiver since almost
      three years.
      Acked-by: default avatarYing Xue <ying.xue@windriver.com>
      Acked-by: default avatarAllan Stephens <allan.stephens@windriver.com>
      Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      115403df
    • Eric W. Biederman's avatar
      net: Remove protocol from struct dst_ops · ddb3b603
      Eric W. Biederman authored
      After my change to neigh_hh_init to obtain the protocol from the
      neigh_table there are no more users of protocol in struct dst_ops.
      Remove the protocol field from dst_ops and all of it's initializers.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ddb3b603
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 13259db5
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-03-09
      
      This series contains updates to i40e and i40evf.
      
      Greg cleans up some "hello world" strings which were left around from
      early development.
      
      Shannon modifies the drive to make sure the sizeof() calls are taking
      the size of the actual struct that we care about.  Also updates the
      NVMUpdate read/write so that it is less noisy when logging.  This was
      because the NVMUpdate tool does not necessarily know the ReadOnly map of
      the current NVM image, and must try reading and writing words that may be
      protected.  This generates an error out of the Firmware request that the
      driver logs.  Unfortunately, this ended up spitting out hundreds of
      bogus read/write error messages.  If a user wants the noisy logging,
      the change can be overridden by enabling the NVM update debugging.
      
      Mitch fixes a possible deadlock issue where if a reset occurred when the
      netdev is closed, the reset task will hang in napi_disable.  Added
      ethtool RSS support as suggested by Ben Hutchings.
      
      Jesse fixes a bug introduced in the force writeback code, where the
      interrupt rate was set to 0 (maximum) by accident.  The driver must
      correctly set the NOITR fields to avoid IT update as a side effect
      of triggering the software interrupt.
      
      I provided a simple cleanup to make the use of PF/VF consistent, which
      was reported by Joe Perches.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      13259db5
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 5428aef8
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for your net-next
      tree. Basically, improvements for the packet rejection infrastructure,
      deprecation of CLUSTERIP, cleanups for nf_tables and some untangling for
      br_netfilter. More specifically they are:
      
      1) Send packet to reset flow if checksum is valid, from Florian Westphal.
      
      2) Fix nf_tables reject bridge from the input chain, also from Florian.
      
      3) Deprecate the CLUSTERIP target, the cluster match supersedes it in
         functionality and it's known to have problems.
      
      4) A couple of cleanups for nf_tables rule tracing infrastructure, from
         Patrick McHardy.
      
      5) Another cleanup to place transaction declarations at the bottom of
         nf_tables.h, also from Patrick.
      
      6) Consolidate Kconfig dependencies wrt. NF_TABLES.
      
      7) Limit table names to 32 bytes in nf_tables.
      
      8) mac header copying in bridge netfilter is already required when
         calling ip_fragment(), from Florian Westphal.
      
      9) move nf_bridge_update_protocol() to br_netfilter.c, also from
         Florian.
      
      10) Small refactor in br_netfilter in the transmission path, again from
          Florian.
      
      11) Move br_nf_pre_routing_finish_bridge_slow() to br_netfilter.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5428aef8
    • Josh Cartwright's avatar
      net: macb: constify macb configuration data · 0b2eb3e9
      Josh Cartwright authored
      The configurations are not modified by the driver.  Make them 'const' so
      that they may be placed in a read-only section.
      Signed-off-by: default avatarJosh Cartwright <joshc@ni.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0b2eb3e9