1. 24 Nov, 2014 5 commits
    • Mahesh Bandewar's avatar
      ipvlan: Initial check-in of the IPVLAN driver. · 2ad7bf36
      Mahesh Bandewar authored
      This driver is very similar to the macvlan driver except that it
      uses L3 on the frame to determine the logical interface while
      functioning as packet dispatcher. It inherits L2 of the master
      device hence the packets on wire will have the same L2 for all
      the packets originating from all virtual devices off of the same
      master device.
      This driver was developed keeping the namespace use-case in
      mind. Hence most of the examples given here take that as the
      base setup where main-device belongs to the default-ns and
      virtual devices are assigned to the additional namespaces.
      The device operates in two different modes and the difference
      in these two modes in primarily in the TX side.
      (a) L2 mode : In this mode, the device behaves as a L2 device.
      TX processing upto L2 happens on the stack of the virtual device
      associated with (namespace). Packets are switched after that
      into the main device (default-ns) and queued for xmit.
      RX processing is simple and all multicast, broadcast (if
      applicable), and unicast belonging to the address(es) are
      delivered to the virtual devices.
      (b) L3 mode : In this mode, the device behaves like a L3 device.
      TX processing upto L3 happens on the stack of the virtual device
      associated with (namespace). Packets are switched to the
      main-device (default-ns) for the L2 processing. Hence the routing
      table of the default-ns will be used in this mode.
      RX processins is somewhat similar to the L2 mode except that in
      this mode only Unicast packets are delivered to the virtual device
      while main-dev will handle all other packets.
      The devices can be added using the "ip" command from the iproute2
      package -
      	ip link add link <master> <virtual> type ipvlan mode [ l2 | l3 ]
      Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: Maciej Żenczykowski <maze@google.com>
      Cc: Laurent Chavey <chavey@google.com>
      Cc: Tim Hockin <thockin@google.com>
      Cc: Brandon Philips <brandon.philips@coreos.com>
      Cc: Pavel Emelianov <xemul@parallels.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Alban Bedel's avatar
      8139too: The maximum MTU should allow for VLAN headers · 2bbea0a8
      Alban Bedel authored
      As pointed out by Ben Hutchings drivers that allow using VLAN have to
      provide enough headroom for the VLAN tags.
      Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Nimrod Andy's avatar
      net: fec: init maximum receive buffer size for ring1 and ring2 · d543a762
      Nimrod Andy authored
      i.MX6SX fec support three rx ring1, the current driver lost to init
      ring1 and ring2 maximum receive buffer size, that cause receving
      frame date length error. The driver reports "rcv is not +last" error
      log in user case.
      Signed-off-by: default avatarFugang Duan <B38611@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Eric Dumazet's avatar
      enic: use netdev_rss_key_fill() helper · c33d23c2
      Eric Dumazet authored
      Use of well known RSS key might increase attack surface.
      Switch to a random one, using generic helper so that all
      ports share a common key.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Christian Benvenuti <benve@cisco.com>
      Cc: Govindarajulu Varadarajan <_govind@gmx.com>
      Cc: Sujith Sankar <ssujith@cisco.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Ian Morris's avatar
      ipv6: coding style improvements (remove assignment in if statements) · e5d08d71
      Ian Morris authored
      This change has no functional impact and simply addresses some coding
      style issues detected by checkpatch. Specifically this change
      adjusts "if" statements which also include the assignment of a
      No changes to the resultant object files result as determined by objdiff.
      Signed-off-by: default avatarIan Morris <ipm@chirality.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
  2. 23 Nov, 2014 3 commits
  3. 22 Nov, 2014 18 commits
    • David S. Miller's avatar
      Merge branch 'cxgb4-next' · 10041413
      David S. Miller authored
      Hariprasad Shenai says:
      RDMA/cxgb4,cxgb4vf,csiostor: Cleanup macros
      This series continues to cleanup all the macros/register defines related to
      filter, port, VI, queue, RSS, LDST, firmware, etc that are defined in t4fw_api.h
      and the affected files.
      Will post few more series so that we can cover all the macros so that they all
      follow the same style to be consistent.
      The patches series is created against 'net-next' tree.
      And includes patches on cxgb4, cxgb4vf, iw_cxgb4 and csiostor driver.
      We have included all the maintainers of respective drivers. Kindly review the
      change and let us know in case of any review comments.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      RDMA/cxgb4/cxgb4vf/csiostor: Cleanup macros/register defines related to PCIE, RSS and FW · b2e1a3f0
      Hariprasad Shenai authored
      This patch cleanups all PCIE, RSS & FW related macros/register defines that are
      defined in t4fw_api.h and the affected files.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      cxgb4/cxgb4vf/csiostor: Cleanup macros/register defines related to port and VI · 2b5fb1f2
      Hariprasad Shenai authored
      This patch cleanups all port and VI related macros/register defines that are
      defined in t4fw_api.h and the affected files.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      cxgb4/cxgb4vf/csiostor: Cleanup macros/register defines related to queues · 6e4b51a6
      Hariprasad Shenai authored
      This patch cleanups all queue related macros/register defines that are defined
      in t4fw_api.h and the affected files.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      RDMA/cxgb4/csiostor: Cleansup FW related macros/register defines for PF/VF and LDST · 5167865a
      Hariprasad Shenai authored
      This patch cleanups PF/VF and LDST related macros/register defines that are
      defined in t4fw_api.h and the affected files.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Hariprasad Shenai's avatar
      RDMA/cxgb4: Cleanup Filter related macros/register defines · 77a80e23
      Hariprasad Shenai authored
      This patch cleanups all filter related macros/register defines that are defined
      in t4fw_api.h and the affected files.
      Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Jesse Brandeburg's avatar
      i40e: enable fdb add code, remove unused code · 2f90ade6
      Jesse Brandeburg authored
      The original FDB code submission wasn't correct and the code
      wasn't enabled.  This removes some dead code (can use the common kernel
      code for fdb_del and fdb_dump) and correctly enables the fdb_add
      function pointer.
      The fdb_add functionality is important to i40e because it is needed
      for a workaround to allow bridges to work correctly on the i40e
      Reported-by: default avatarJiri Pirko <jiri@resnulli.us>
      Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Acked-by: default avatarGreg Rose <gregory.v.rose@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
      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 · 14591433
      David S. Miller authored
      A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
      in 'net-next'.
      Add build fix into the merge from Stephen Rothwell in openvswitch, the
      logging macros take a new initial 'log' argument, a new call was added
      in 'net' so when we merge that in here we have to explicitly add the
      new 'log' arg to it else the build fails.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8a84e01e
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       1) Fix BUG when decrypting empty packets in mac80211, from Ronald Wahl.
       2) nf_nat_range is not fully initialized and this is copied back to
          userspace, from Daniel Borkmann.
       3) Fix read past end of b uffer in netfilter ipset, also from Dan
       4) Signed integer overflow in ipv4 address mask creation helper
          inet_make_mask(), from Vincent BENAYOUN.
       5) VXLAN, be2net, mlx4_en, and qlcnic need ->ndo_gso_check() methods to
          properly describe the device's capabilities, from Joe Stringer.
       6) Fix memory leaks and checksum miscalculations in openvswitch, from
          Pravin B SHelar and Jesse Gross.
       7) FIB rules passes back ambiguous error code for unreachable routes,
          making behavior confusing for userspace.  Fix from Panu Matilainen.
       8) ieee802154fake_probe() doesn't release resources properly on error,
          from Alexey Khoroshilov.
       9) Fix skb_over_panic in add_grhead(), from Daniel Borkmann.
      10) Fix access of stale slave pointers in bonding code, from Nikolay
      11) Fix stack info leak in PPP pptp code, from Mathias Krause.
      12) Cure locking bug in IPX stack, from Jiri Bohac.
      13) Revert SKB fclone memory freeing optimization that is racey and can
          allow accesses to freed up memory, from Eric Dumazet.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (71 commits)
        tcp: Restore RFC5961-compliant behavior for SYN packets
        net: Revert "net: avoid one atomic operation in skb_clone()"
        virtio-net: validate features during probe
        cxgb4 : Fix DCB priority groups being returned in wrong order
        ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg
        openvswitch: Don't validate IPv6 label masks.
        pptp: fix stack info leak in pptp_getname()
        brcmfmac: don't include linux/unaligned/access_ok.h
        cxgb4i : Don't block unload/cxgb4 unload when remote closes TCP connection
        ipv6: delete protocol and unregister rtnetlink when cleanup
        net/mlx4_en: Add VXLAN ndo calls to the PF net device ops too
        bonding: fix curr_active_slave/carrier with loadbalance arp monitoring
        mac80211: minstrel_ht: fix a crash in rate sorting
        vxlan: Inline vxlan_gso_check().
        can: m_can: update to support CAN FD features
        can: m_can: fix incorrect error messages
        can: m_can: add missing delay after setting CCCR_INIT bit
        can: m_can: fix not set can_dlc for remote frame
        can: m_can: fix possible sleep in napi poll
        can: m_can: add missing message RAM initialization
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 928352e9
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Just two radeon and two intel fixes: endian and regression fixes"
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: fix endian swapping in vbios fetch for tdp table
        drm/radeon: disable native backlight control on pre-r6xx asics (v2)
        drm/i915: Kick fbdev before vgacon
        drm/i915: drop WaSetupGtModeTdRowDispatch:snb
    • Linus Torvalds's avatar
      Merge tag 'sound-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 9a7e4f56
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This batch ended up as a relatively high volume due to pending ASoC
        fixes.  But most of fixes there are trivial and/or device- specific
        fixes and quirks, so safe to apply.  The only (ASoC) core fixes are
        the DPCM race fix and the machine-driver matching fix for
      * tag 'sound-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - fix the mic mute led problem for Latitude E5550
        ALSA: hda - move DELL_WMI_MIC_MUTE_LED to the tail in the quirk chain
        ASoC: wm_adsp: Avoid attempt to free buffers that might still be in use
        ALSA: usb-audio: Set the Control Selector to SU_SELECTOR_CONTROL for UAC2
        ALSA: usb-audio: Add ctrl message delay quirk for Marantz/Denon devices
        ASoC: sgtl5000: Fix SMALL_POP bit definition
        ASoC: cs42l51: re-hook of_match_table pointer
        ASoC: rt5670: change dapm routes of PLL connection
        ASoC: rt5670: correct the incorrect default values
        ASoC: samsung: Add MODULE_DEVICE_TABLE for Snow
        ASoC: max98090: Correct pclk divisor settings
        ASoC: dpcm: Fix race between FE/BE updates and trigger
        ASoC: Fix snd_soc_find_dai() matching component by name
        ASoC: rsnd: remove unsupported PAUSE flag
        ASoC: fsi: remove unsupported PAUSE flag
        ASoC: rt5645: Mark RT5645_TDM_CTRL_3 as readable
        ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl
        ASoC: es8328-i2c: Fix i2c_device_id name field in es8328_id
        ASoC: fsl_asrc: Add reg_defaults for regmap to fix kernel dump
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · f100a746
      Linus Torvalds authored
      Pull ACPI power management fix from Rafael Wysocki:
       "This is just a one-liner fixing a regression introduced in 3.13 that
        broke system suspend on some Chromebooks.
        On those machines there are ACPI device objects for some I2C devices
        that can wake up the system from sleep states, but that is done via a
        platform-specific mechanism and the ACPI objects don't contain any
        wakeup-related information.  When we started to use ACPI power
        management with those devices (which happened during the 3.13 cycle),
        their configuration confused the ACPI PM layer that returned error
        codes from suspend callbacks for them causing system suspend to fail.
        However, the ACPI PM layer can safely ignore the wakeup setting from a
        device driver if the ACPI object corresponding to the device in
        question doesn't contain wakeup information in which case the driver
        itself is responsible for setting up the device for system wakeup"
      * tag 'pm+acpi-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 2e29a6d0
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
       "DeviceTree fixes for 3.18:
         - two fixes for OF selftest code
         - fix for PowerPC address parsing to disable work-around except on
           old PowerMACs
         - fix a crash when earlycon is enabled, but no device is found
         - DT documentation fixes and missing vendor prefixes
        All but the doc updates are also for stable"
      * tag 'devicetree-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of/selftest: Fix testing when /aliases is missing
        of/selftest: Fix off-by-one error in removal path
        documentation: pinctrl bindings: Fix trivial typo 'abitrary'
        devicetree: bindings: Add vendor prefix for Micron Technology, Inc.
        of: Add vendor prefix for Chips&Media, Inc.
        of/base: Fix PowerPC address parsing hack
        devicetree: vendor-prefixes.txt: fix whitespace
        of: Fix crash if an earlycon driver is not found
        of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text
        of: Spelling s/stucture/structure/
        devicetree: bindings: add sandisk to the vendor prefixes
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.18-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 08685897
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "These are fixes for an issue with 64-bit PCI bus addresses on 32-bit
        PAE kernels, an APM X-Gene problem (it depended on a generic change we
        removed before merging), a fix for my hotplug device configuration
        changes, and a devicetree documentation update.
        Resource management:
          - Support 64-bit bridge windows if we have 64-bit dma_addr_t (Yinghai Lu)
        PCI device hotplug:
          - Apply _HPX Link Control settings to all devices with a link (Yinghai Lu)
        Generic host bridge driver:
          - Add DT binding for "linux,pci-domain" property (Lucas Stach)
        APM X-Gene:
          - Assign resources to bus before adding new devices (Duc Dang)"
      * tag 'pci-v3.18-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Support 64-bit bridge windows if we have 64-bit dma_addr_t
        PCI: Apply _HPX Link Control settings to all devices with a link
        PCI: Add missing DT binding for "linux,pci-domain" property
        PCI: xgene: Assign resources to bus before adding new devices
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a46171d0
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the target-pending fixes queued for v3.18-rc6.
        The highlights include:
         - target-core OOPs fix with tcm_qla2xxx + vxworks FC initiators +
           zero length SCSI commands having a transfer direction set.  (Roland
           + Craig Watson)
         - vhost-scsi OOPs fix to explicitly prevent WWPN endpoint configfs
           group removal while qemu still has an active reference.  (Paolo +
         - ib_srpt fix for RDMA hardware with lower srp_sq_size limits.
         - two ib_isert work-arounds for running on ocrdma hardware (Or + Sagi
           + Chris)
         - iscsi-target discovery portal typo + SPC-3 PR Preempt SA key
           matching fix (Steve)"
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        IB/isert: Adjust CQ size to HW limits
        target: return CONFLICT only when SA key unmatched
        iser-target: Handle DEVICE_REMOVAL event on network portal listener correctly
        ib_isert: Add max_send_sge=2 minimum for control PDU responses
        srp-target: Retry when QP creation fails with ENOMEM
        iscsi-target: return the correct port in SendTargets
        vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT
        target: Don't call TFO->write_pending if data_length == 0
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 4ec69c7e
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "We have couple of fixes for dmaengine queued up:
         - dma mempcy fix for dma configuration of sun6i by Maxime
         - pl330 fixes: First the fixing allocation for data buffers by Liviu
           and then Jon's fixe for fifo width and usage"
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: Fix allocation size for PL330 data buffer depth.
        dmaengine: pl330: Limit MFIFO usage for memcpy to avoid exhausting entries
        dmaengine: pl330: Align DMA memcpy operations to MFIFO width
        dmaengine: sun6i: Fix memcpy operation
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · e6a588d0
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "More 3.18 fixes for MIPS:
         - backtraces were not quite working on on 64-bit kernels
         - loongson needs a different cache coherency setting
         - Loongson 3 is a MIPS64 R2 version but due to erratum we treat is an
           older architecture revision.
         - fix build errors due to undefined references to __node_distances
           for certain configurations.
         - fix instruction decodig in the jump label code.
         - for certain configurations copy_{from,to}_user destroy the content
           of $3 so that register needs to be marked as clobbed by the calling
         - Hardware Table Walker fixes.
         - fill the delay slot of the last instruction of memcpy otherwise
           whatever ends up there randomly might have undesirable effects.
         - ensure get_user/__get_user always zero the variable to be read even
           in case of an error"
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: jump_label.c: Handle the microMIPS J instruction encoding
        MIPS: jump_label.c: Correct the span of the J instruction
        MIPS: Zero variable read by get_user / __get_user in case of an error.
        MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller
        MIPS: tlb-r4k: Add missing HTW stop/start sequences
        MIPS: asm: uaccess: Add v1 register to clobber list on EVA
        MIPS: oprofile: Fix backtrace on 64-bit kernel
        MIPS: Loongson: Set Loongson-3's ISA level to MIPS64R1
        MIPS: Loongson: Fix the write-combine CCA value setting
        MIPS: IP27: Fix __node_distances undefined error
        MIPS: Loongson3: Fix __node_distances undefined error
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 4fc82c0a
      Linus Torvalds authored
      Pull powerpc fix from Michael Ellerman:
       "One fix from Scott, he says:
        This patch fixes a crash (introduced in v3.18-rc1) in the FSL MSI driver
        when threaded IRQs are enabled"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/fsl_msi: mark the msi cascade handler IRQF_NO_THREAD
  4. 21 Nov, 2014 14 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c6c9161d
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "Misc fixes:
         - gold linker build fix
         - noxsave command line parsing fix
         - bugfix for NX setup
         - microcode resume path bug fix
         - _TIF_NOHZ versus TIF_NOHZ bugfix as discussed in the mysterious
           lockup thread"
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, syscall: Fix _TIF_NOHZ handling in syscall_trace_enter_phase1
        x86, kaslr: Handle Gold linker for finding bss/brk
        x86, mm: Set NX across entire PMD at boot
        x86, microcode: Update BSPs microcode on resume
        x86: Require exact match for 'noxsave' command line option
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8b2ed21e
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixes: two NUMA fixes, two cputime fixes and an RCU/lockdep fix"
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cputime: Fix clock_nanosleep()/clock_gettime() inconsistency
        sched/cputime: Fix cpu_timer_sample_group() double accounting
        sched/numa: Avoid selecting oneself as swap target
        sched/numa: Fix out of bounds read in sched_init_numa()
        sched: Remove lockdep check in sched_move_task()
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 13f5004c
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixes: two Intel uncore driver fixes, a CPU-hotplug fix and a
        build dependencies fix"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel/uncore: Fix boot crash on SBOX PMU on Haswell-EP
        perf/x86/intel/uncore: Fix IRP uncore register offsets on Haswell EP
        perf: Fix corruption of sibling list with hotplug
        perf/x86: Fix embarrasing typo
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a64bb02f
      Linus Torvalds authored
      Pull core fix from Ingo Molnar:
       "Fix GENMASK macro shift overflow"
      Nobody seems to currently use GENMASK() to fill every single last bit
      (which is what overflows) in-tree, and gcc would warn about it, so we
      have that going for us.  But apparently there are pending changes that
      want this.
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        bitops: Fix shift overflow in GENMASK macros
    • David S. Miller's avatar
      Merge tag 'master-2014-11-20' of... · 53b15ef3
      David S. Miller authored
      Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
      John W. Linville says:
      pull request: wireless-next 2014-11-21
      Please pull this batch of updates intended for the 3.19 stream...
      For the mac80211 bits, Johannes says:
      "It has been a while since my last pull request, so we accumulated
      another relatively large set of changes:
       * TDLS off-channel support set from Arik/Liad, with some support
         patches I did
       * custom regulatory fixes from Arik
       * minstrel VHT fix (and a small optimisation) from Felix
       * add back radiotap vendor namespace support (myself)
       * random MAC address scanning for cfg80211/mac80211/hwsim (myself)
       * CSA improvements (Luca)
       * WoWLAN Net Detect (wake on network found) support (Luca)
       * and lots of other smaller changes from many people"
      For the Bluetooth bits, Johan says:
      "Here's another set of patches for 3.19. Most of it is again fixes and
      cleanups to ieee802154 related code from Alexander Aring. We've also got
      better handling of hardware error events along with a proper API for HCI
      drivers to notify the HCI core of such situations. There's also a minor
      fix for mgmt events as well as a sparse warning fix. The code for
      sending HCI commands synchronously also gets a fix where we might loose
      the completion event in the case of very fast HW (particularly easily
      reproducible with an emulated HCI device)."
      "Here's another bluetooth-next pull request for 3.19. We've got:
       - Various fixes, cleanups and improvements to ieee802154/mac802154
       - Support for a Broadcom BCM20702A1 variant
       - Lots of lockdep fixes
       - Fixed handling of LE CoC errors that should trigger SMP"
      For the Atheros bits, Kalle says:
      "One ath6kl patch and rest for ath10k, but nothing really major which
      stands out. Most notable:
      o fix resume (Bartosz)
      o firmware restart is now faster and more reliable (Michal)
      o it's now possible to test hardware restart functionality without
        crashing the firmware using hw-restart parameter with
        simulate_fw_crash debugfs file (Michal)"
      On top of that...both ath9k and mwifiex get their usual level of
      updates.  Of note is the ath9k spectral scan work from Oleksij Rempel.
      I also pulled from the wireless tree in order to avoid some merge issues.
      Please let me know if there are problems!
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge branch 'defxx-next' · b48c5ec5
      David S. Miller authored
      Maciej W. Rozycki says:
      defxx: Assorted fixes, mainly for EISA
       This is another small series fixing issues with the defxx driver,
      mainly for EISA boards, but there's one patch for PCI as well.
       In the end, with the inexistent second IDE channel forcefully disabled
      in the IDE driver, I wasn't able to retrigger spurious IRQ 15 interrupts
      I previously saw and suspected the DEFEA to be the cause.  So it looks
      to me these were real noise on IRQ 15 rather than the latency in
      interrupt acknowledge in the DEFEA board causing the slave 8259A to
      issue the spurious interrupt vector.  In any case not an issue with the
      defxx driver, so nothing to do here unless the problem resurfaces.
       I haven't seen your announcement about opening net-next since the
      closure on Oct 6th, but from the patch traffic and the policy described
      in Documentation/networking/netdev-FAQ.txt I gather your tree is open.
      And these are bug fixes anyway, not new features, so please apply.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Maciej W. Rozycki's avatar
      defxx: Clean up DEFEA resource management · 4d0438e5
      Maciej W. Rozycki authored
      Reserve DEFEA resources according to actual use.  There are three
      regions, for the ESIC ASIC's CSRs, for the discrete Burst Holdoff
      register, and for the PDQ ASIC's CSRs.  The latter is mapped in the
      memory or port I/O address space depending on configuration.  The two
      formers are hardwired and always mapped in the port I/O address space.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Maciej W. Rozycki's avatar
      defxx: Disable DEFEA's ESIC I/O decoding on shutdown · 6a931423
      Maciej W. Rozycki authored
      Make sure the option card does not respond after shutdown by disabling
      it via ESIC's Expansion Board Control register.  Also disable memory and
      port I/O decoders, the latter in particular to disable slot-specific I/O
      decoding that otherwise remains active even in the board is disabled.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Maciej W. Rozycki's avatar
      defxx: Correct DEFEA's ESIC MMIO decoding · fef85fc4
      Maciej W. Rozycki authored
      Use ESIC's memory area 1 (MEMCS1) and its Memory Address High Compare
      and Memory Address Low Compare registers to set up the MMIO range for
      decoding accesses to PDQ ASIC registers.  Previously the PDQ ASIC was
      thought to be addressable with the memory area 0 (MEMCS0) and its Memory
      Address Compare and Memory Address Mask registers.
      The MMIO range allocated for the option card is preset via ECU (EISA
      Configuration Utility) and can be disabled, so handle such a case
      gracefully too.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Maciej W. Rozycki's avatar
      defxx: Fix DEFPA enable error propagation · a65da0c3
      Maciej W. Rozycki authored
      Correctly propagate the error code from `pci_enable_device' if non zero.
      Currently a failure of this function is correctly recognized and device
      initialization abandoned, however a successful completion code returned.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Richard Cochran's avatar
      vlan: Pass ethtool get_ts_info queries to real device. · 37dd9255
      Richard Cochran authored
      Commit a6111d3c
       "vlan: Pass SIOC[SG]HWTSTAMP ioctls to real device"
      intended to enable hardware time stamping on VLAN interfaces, but
      passing SIOCSHWTSTAMP is only half of the story. This patch adds
      the second half, by letting user space find out the time stamping
      capabilities of the device backing a VLAN interface.
      Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Calvin Owens's avatar
      tcp: Restore RFC5961-compliant behavior for SYN packets · 0c228e83
      Calvin Owens authored
      Commit c3ae62af ("tcp: should drop incoming frames without ACK
      flag set") was created to mitigate a security vulnerability in which a
      local attacker is able to inject data into locally-opened sockets by
      using TCP protocol statistics in procfs to quickly find the correct
      sequence number.
      This broke the RFC5961 requirement to send a challenge ACK in response
      to spurious RST packets, which was subsequently fixed by commit
      7b514a88 ("tcp: accept RST without ACK flag").
      Unfortunately, the RFC5961 requirement that spurious SYN packets be
      handled in a similar manner remains broken.
      RFC5961 section 4 states that:
         ... the handling of the SYN in the synchronized state SHOULD be
         performed as follows:
         1) If the SYN bit is set, irrespective of the sequence number, TCP
            MUST send an ACK (also referred to as challenge ACK) to the remote
            After sending the acknowledgment, TCP MUST drop the unacceptable
            segment and stop processing further.
         By sending an ACK, the remote peer is challenged to confirm the loss
         of the previous connection and the request to start a new connection.
         A legitimate peer, after restart, would not have a TCB in the
         synchronized state.  Thus, when the ACK arrives, the peer should send
         a RST segment back with the sequence number derived from the ACK
         field that caused the RST.
         This RST will confirm that the remote peer has indeed closed the
         previous connection.  Upon receipt of a valid RST, the local TCP
         endpoint MUST terminate its connection.  The local TCP endpoint
         should then rely on SYN retransmission from the remote end to
         re-establish the connection.
      This patch lets SYN packets through the discard added in c3ae62af
      so that spurious SYN packets are properly dealt with as per the RFC.
      The challenge ACK is sent unconditionally and is rate-limited, so the
      original vulnerability is not reintroduced by this patch.
      Signed-off-by: default avatarCalvin Owens <calvinowens@fb.com>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Eric Dumazet's avatar
      net: Revert "net: avoid one atomic operation in skb_clone()" · e7820e39
      Eric Dumazet authored
      Not sure what I was thinking, but doing anything after
      releasing a refcount is suicidal or/and embarrassing.
      By the time we set skb->fclone to SKB_FCLONE_FREE, another cpu
      could have released last reference and freed whole skb.
      We potentially corrupt memory or trap if CONFIG_DEBUG_PAGEALLOC is set.
      Reported-by: default avatarChris Mason <clm@fb.com>
      Fixes: ce1a4ea3
       ("net: avoid one atomic operation in skb_clone()")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Sabrina Dubroca <sd@queasysnail.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · cd91a88b
      David S. Miller authored
      Jeff Kirsher says:
      Intel Wired LAN Driver Updates 2014-11-20
      This series contains updates to ixgbevf, i40e and i40evf.
      Emil updates ixgbevf with much of the work that Alex Duyck did while at
      Intel.  First updates the driver to clear the status bits on allocation
      instead of in the cleanup routine, this way we can leave the recieve
      descriptor rings as a read only memory block until we actually have
      buffers to give back to the hardware.  Clean up ixgbevf_clean_rx_irq()
      by creating ixgbevf_process_skb_field() to merge several similar
      operations into this new function.  Cleanup temporary variables within
      the receive hot-path and reducing the scope of variables that do not
      need to exist outside the main loop.  Save on stack space by just
      storing our updated values back in next_to_clean instead of using
      a stack variable, which also collapses the size the function.  Improve
      performace on IOMMU enabled systems and reduce cache misses by changing
      the basic receive patch for ixgbevf so that instead of receiving the
      data into an skb, it is received into a double buffered page.  Add
      netpoll support by creating ixgbevf_netpoll(), which is a callback for
      .ndo_poll_controller to allow for the VF interface to be used with
      Mitch provides several cleanups and trivial fixes for i40e and i40evf.
      First is a fix the overloading of the msg_size field in the
      arq_event_info struct by splitting the field into two and renaming to
      indicate the actual function of each field.  Updates code comments
      to match the actual function.  Cleanup several checkpatch.pl warnings
      by adding or removing blank lines, aligning function parameters, and
      correcting over-long lines (which makes the code more readable).
      Shannon provides a patch for i40e to write the extra bits that will
      turn off the ITR wait for the interrupt, since we want the SW INT to
      go off as soon as possible.
      v2: updated patch 07 based on feedback from Alex Duyck by
       - adding pfmemalloc check to a new function for reusable page
       - moved atomic_inc outside of #if/else in ixgbevf_add_rx_frag()
       - reverted the removal of the API check in ixgbevf_change_mtu()
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>