1. 28 11月, 2014 4 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ae979430
      Linus Torvalds 提交于
      Pull sparc fixlet from David Miller:
       "Aparc fix to add dma_cache_sync(), even if a nop it should be provided
        if dma_{alloc,free}_noncoherent() is provided too"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Add NOP dma_cache_sync() implementation.
      ae979430
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8e845971
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "Several small fixes here:
      
         1) Don't crash in tg3 driver when the number of tx queues has been
            configured to be different from the number of rx queues.  From
            Thadeu Lima de Souza Cascardo.
      
         2) VLAN filter not disabled properly in promisc mode in ixgbe driver,
            from Vlad Yasevich.
      
         3) Fix OOPS on dellink op in VTI tunnel driver, from Xin Long.
      
         4) IPV6 GRE driver WCCP code checks skb->protocol for ETH_P_IP
            instead of ETH_P_IPV6, whoops.  From Yuri Chislov.
      
         5) Socket matching in ping driver is buggy when packet AF does not
            match socket's AF.  Fix from Jane Zhou.
      
         6) Fix checksum calculation errors in VXLAN due to where the
            udp_tunnel6_xmit_skb() helper gets it's saddr/daddr from.  From
            Alexander Duyck.
      
         7) Fix 5G detection problem in rtlwifi driver, from Larry Finger.
      
         8) Fix NULL deref in tcp_v{4,6}_send_reset, from Eric Dumazet.
      
         9) Various missing netlink attribute verifications in bridging code,
            from Thomas Graf.
      
        10) tcp_recvmsg() unconditionally calls ipv4 ip_recv_error even for
            ipv6 sockets, whoops.  Fix from Willem de Bruijn"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
        net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
        bridge: Sanitize IFLA_EXT_MASK for AF_BRIDGE:RTM_GETLINK
        bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVE
        net: Check for presence of IFLA_AF_SPEC
        net: Validate IFLA_BRIDGE_MODE attribute length
        bridge: Validate IFLA_BRIDGE_FLAGS attribute length
        stmmac: platform: fix default values of the filter bins setting
        net/mlx4_core: Limit count field to 24 bits in qp_alloc_res
        net: dsa: bcm_sf2: reset switch prior to initialization
        net: dsa: bcm_sf2: fix unmapping registers in case of errors
        tg3: fix ring init when there are more TX than RX channels
        tcp: fix possible NULL dereference in tcp_vX_send_reset()
        rtlwifi: Change order in device startup
        rtlwifi: rtl8821ae: Fix 5G detection problem
        Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse"
        vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX]
        ip6_udp_tunnel: Fix checksum calculation
        net-timestamp: Fix a documentation typo
        net/ping: handle protocol mismatching scenario
        af_packet: fix sparse warning
        ...
      8e845971
    • L
      Merge tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 190fc9d9
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "There's a couple of driver fixes here, plus one core fix for the DMA
        mapping which wasn't doing the right thing for vmalloc()ed addresses
        that hadn't been through kmap().  It's fairly rare to use vmalloc()
        with SPI and it's a subset of those users who might fail so it's
        unsurprising that this wasn't noticed sooner"
      
      * tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: sirf: fix word width configuration
        spi: Fix mapping from vmalloc-ed buffer to scatter list
        spi: dw: Fix dynamic speed change.
      190fc9d9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 0210bb60
      Linus Torvalds 提交于
      Pull input layer fixes from Dmitry Torokhov:
       "The main change is to fix breakage in Elantech driver introduced by
        the recent commit adding trackpoint reporting to protocol v4.  Now we
        are trusting the hardware to advertise the trackpoint properly and do
        not try to decode the data as trackpoint if firmware told us it is not
        present"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xpad - use proper endpoint type
        Input: elantech - trust firmware about trackpoint presence
        Input: synaptics - adjust min/max on Thinkpad E540
      0210bb60
  2. 27 11月, 2014 17 次提交
  3. 26 11月, 2014 19 次提交
    • A
      kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn() · d3fccc7e
      Ard Biesheuvel 提交于
      This reverts commit 85c8555f ("KVM: check for !is_zero_pfn() in
      kvm_is_mmio_pfn()") and renames the function to kvm_is_reserved_pfn.
      
      The problem being addressed by the patch above was that some ARM code
      based the memory mapping attributes of a pfn on the return value of
      kvm_is_mmio_pfn(), whose name indeed suggests that such pfns should
      be mapped as device memory.
      
      However, kvm_is_mmio_pfn() doesn't do quite what it says on the tin,
      and the existing non-ARM users were already using it in a way which
      suggests that its name should probably have been 'kvm_is_reserved_pfn'
      from the beginning, e.g., whether or not to call get_page/put_page on
      it etc. This means that returning false for the zero page is a mistake
      and the patch above should be reverted.
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      d3fccc7e
    • A
      arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn() · bb55e9b1
      Ard Biesheuvel 提交于
      Instead of using kvm_is_mmio_pfn() to decide whether a host region
      should be stage 2 mapped with device attributes, add a new static
      function kvm_is_device_pfn() that disregards RAM pages with the
      reserved bit set, as those should usually not be mapped as device
      memory.
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      bb55e9b1
    • C
      arm/arm64: KVM: vgic: Fix error code in kvm_vgic_create() · 6b50f540
      Christoffer Dall 提交于
      If we detect another vCPU is running we just exit and return 0 as if we
      succesfully created the VGIC, but the VGIC wouldn't actual be created.
      
      This shouldn't break in-kernel behavior because the kernel will not
      observe the failed the attempt to create the VGIC, but userspace could
      be rightfully confused.
      
      Cc: Andre Przywara <andre.przywara@arm.com>
      Signed-off-by: NChristoffer Dall <christoffer.dall@linaro.org>
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      6b50f540
    • C
      arm64: KVM: Handle traps of ICC_SRE_EL1 as RAZ/WI · db7dedd0
      Christoffer Dall 提交于
      When running on a system with a GICv3, we currenly don't allow the guest
      to access the system register interface of the GICv3.  We do this by
      clearing the ICC_SRE_EL2.Enable, which causes all guest accesses to
      ICC_SRE_EL1 to trap to EL2 and causes all guest accesses to other ICC_
      registers to cause an undefined exception in the guest.
      
      However, we currently don't handle the trap of guest accesses to
      ICC_SRE_EL1 and will spill out a warning.  The trap just needs to handle
      the access as RAZ/WI, and a guest that tries to prod this register and
      set ICC_SRE_EL1.SRE=1, must read back the value (which Linux already
      does) to see if it succeeded, and will thus observe that ICC_SRE_EL1.SRE
      was not set.
      
      Add the simple trap handler in the sorted table of the system registers.
      Signed-off-by: NChristoffer Dall <christoffer.dall@linaro.org>
      [ardb: added cp15 handling]
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      db7dedd0
    • M
      arm64: KVM: fix unmapping with 48-bit VAs · 7cbb87d6
      Mark Rutland 提交于
      Currently if using a 48-bit VA, tearing down the hyp page tables (which
      can happen in the absence of a GICH or GICV resource) results in the
      rather nasty splat below, evidently becasue we access a table that
      doesn't actually exist.
      
      Commit 38f791a4 (arm64: KVM: Implement 48 VA support for KVM EL2
      and Stage-2) added a pgd_none check to __create_hyp_mappings to account
      for the additional level of tables, but didn't add a corresponding check
      to unmap_range, and this seems to be the source of the problem.
      
      This patch adds the missing pgd_none check, ensuring we don't try to
      access tables that don't exist.
      
      Original splat below:
      
      kvm [1]: Using HYP init bounce page @83fe94a000
      kvm [1]: Cannot obtain GICH resource
      Unable to handle kernel paging request at virtual address ffff7f7fff000000
      pgd = ffff800000770000
      [ffff7f7fff000000] *pgd=0000000000000000
      Internal error: Oops: 96000004 [#1] PREEMPT SMP
      Modules linked in:
      CPU: 1 PID: 1 Comm: swapper/0 Not tainted 3.18.0-rc2+ #89
      task: ffff8003eb500000 ti: ffff8003eb45c000 task.ti: ffff8003eb45c000
      PC is at unmap_range+0x120/0x580
      LR is at free_hyp_pgds+0xac/0xe4
      pc : [<ffff80000009b768>] lr : [<ffff80000009cad8>] pstate: 80000045
      sp : ffff8003eb45fbf0
      x29: ffff8003eb45fbf0 x28: ffff800000736000
      x27: ffff800000735000 x26: ffff7f7fff000000
      x25: 0000000040000000 x24: ffff8000006f5000
      x23: 0000000000000000 x22: 0000007fffffffff
      x21: 0000800000000000 x20: 0000008000000000
      x19: 0000000000000000 x18: ffff800000648000
      x17: ffff800000537228 x16: 0000000000000000
      x15: 000000000000001f x14: 0000000000000000
      x13: 0000000000000001 x12: 0000000000000020
      x11: 0000000000000062 x10: 0000000000000006
      x9 : 0000000000000000 x8 : 0000000000000063
      x7 : 0000000000000018 x6 : 00000003ff000000
      x5 : ffff800000744188 x4 : 0000000000000001
      x3 : 0000000040000000 x2 : ffff800000000000
      x1 : 0000007fffffffff x0 : 000000003fffffff
      
      Process swapper/0 (pid: 1, stack limit = 0xffff8003eb45c058)
      Stack: (0xffff8003eb45fbf0 to 0xffff8003eb460000)
      fbe0:                                     eb45fcb0 ffff8003 0009cad8 ffff8000
      fc00: 00000000 00000080 00736140 ffff8000 00736000 ffff8000 00000000 00007c80
      fc20: 00000000 00000080 006f5000 ffff8000 00000000 00000080 00743000 ffff8000
      fc40: 00735000 ffff8000 006d3030 ffff8000 006fe7b8 ffff8000 00000000 00000080
      fc60: ffffffff 0000007f fdac1000 ffff8003 fd94b000 ffff8003 fda47000 ffff8003
      fc80: 00502b40 ffff8000 ff000000 ffff7f7f fdec6000 00008003 fdac1630 ffff8003
      fca0: eb45fcb0 ffff8003 ffffffff 0000007f eb45fd00 ffff8003 0009b378 ffff8000
      fcc0: ffffffea 00000000 006fe000 ffff8000 00736728 ffff8000 00736120 ffff8000
      fce0: 00000040 00000000 00743000 ffff8000 006fe7b8 ffff8000 0050cd48 00000000
      fd00: eb45fd60 ffff8003 00096070 ffff8000 006f06e0 ffff8000 006f06e0 ffff8000
      fd20: fd948b40 ffff8003 0009a320 ffff8000 00000000 00000000 00000000 00000000
      fd40: 00000ae0 00000000 006aa25c ffff8000 eb45fd60 ffff8003 0017ca44 00000002
      fd60: eb45fdc0 ffff8003 0009a33c ffff8000 006f06e0 ffff8000 006f06e0 ffff8000
      fd80: fd948b40 ffff8003 0009a320 ffff8000 00000000 00000000 00735000 ffff8000
      fda0: 006d3090 ffff8000 006aa25c ffff8000 00735000 ffff8000 006d3030 ffff8000
      fdc0: eb45fdd0 ffff8003 000814c0 ffff8000 eb45fe50 ffff8003 006aaac4 ffff8000
      fde0: 006ddd90 ffff8000 00000006 00000000 006d3000 ffff8000 00000095 00000000
      fe00: 006a1e90 ffff8000 00735000 ffff8000 006d3000 ffff8000 006aa25c ffff8000
      fe20: 00735000 ffff8000 006d3030 ffff8000 eb45fe50 ffff8003 006fac68 ffff8000
      fe40: 00000006 00000006 fe293ee6 ffff8003 eb45feb0 ffff8003 004f8ee8 ffff8000
      fe60: 004f8ed4 ffff8000 00735000 ffff8000 00000000 00000000 00000000 00000000
      fe80: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      fea0: 00000000 00000000 00000000 00000000 00000000 00000000 000843d0 ffff8000
      fec0: 004f8ed4 ffff8000 00000000 00000000 00000000 00000000 00000000 00000000
      fee0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ff00: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ff20: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ff40: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ff60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ff80: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ffa0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000005 00000000
      ffe0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      Call trace:
      [<ffff80000009b768>] unmap_range+0x120/0x580
      [<ffff80000009cad4>] free_hyp_pgds+0xa8/0xe4
      [<ffff80000009b374>] kvm_arch_init+0x268/0x44c
      [<ffff80000009606c>] kvm_init+0x24/0x260
      [<ffff80000009a338>] arm_init+0x18/0x24
      [<ffff8000000814bc>] do_one_initcall+0x88/0x1a0
      [<ffff8000006aaac0>] kernel_init_freeable+0x148/0x1e8
      [<ffff8000004f8ee4>] kernel_init+0x10/0xd4
      Code: 8b000263 92628479 d1000720 eb01001f (f9400340)
      ---[ end trace 3bc230562e926fa4 ]---
      Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
      Signed-off-by: NMark Rutland <mark.rutland@arm.com>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Jungseok Lee <jungseoklee85@gmail.com>
      Acked-by: NMarc Zyngier <marc.zyngier@arm.com>
      Acked-by: NChristoffer Dall <christoffer.dall@linaro.org>
      Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      7cbb87d6
    • L
      Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux · b914c5b2
      Linus Torvalds 提交于
      Pull nfsd bugfixes from Bruce Fields:
       "These fix one mishandling of the case when security labels are
        configured out, and two races in the 4.1 backchannel code"
      
      * 'for-3.18' of git://linux-nfs.org/~bfields/linux:
        nfsd: Fix slot wake up race in the nfsv4.1 callback code
        SUNRPC: Fix locking around callback channel reply receive
        nfsd: correctly define v4.2 support attributes
      b914c5b2
    • L
      Merge git://git.kvack.org/~bcrl/aio-fixes · 277f850f
      Linus Torvalds 提交于
      Pull aio fix from Ben LaHaise:
       "Dirty page accounting fix for aio"
      
      * git://git.kvack.org/~bcrl/aio-fixes:
        aio: fix uncorrent dirty pages accouting when truncating AIO ring buffer
      277f850f
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · d1ca0007
      Linus Torvalds 提交于
      Pull powerpc fixes from Ben Herrenschmidt:
       "This series fix a nasty issue with radeon adapters on powerpc servers,
        it's all CC'ed stable and has the relevant maintainers ack's/reviews.
      
        Basically, some (radeon) adapters have issues with MSI addresses above
        1T (only support 40-bits).  We had powerpc specific quirk but it only
        listed a specific revision of an adapter that we shipped with our
        machines and didn't properly handle the audio function which some
        distros enable nowadays.
      
        So we made the quirk generic and fixed both the graphic and audio
        drivers properly to use it.
      
        Without that, ppc64 server machines will crash at boot with a radeon
        adapter.
      
        Note: This has been brewing for a while, it just needed a last respin
        which got delayed due to us moving ozlabs to a new location in town
        and other such things taking priority"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/pci: Remove unused force_32bit_msi quirk
        powerpc/pseries: Honor the generic "no_64bit_msi" flag
        powerpc/powernv: Honor the generic "no_64bit_msi" flag
        sound/radeon: Move 64-bit MSI quirk from arch to driver
        gpu/radeon: Set flag to indicate broken 64-bit MSI
        PCI/MSI: Add device flag indicating that 64-bit MSIs don't work
        ALSA: hda - Limit 40bit DMA for AMD HDMI controllers
      d1ca0007
    • L
      Merge tag 'hwmon-for-linus-v3.18-rc7' of... · a6e4a05a
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull a hwmon fix from Guenter Roeck:
       "Fix hwmon registration problem in g762 driver"
      
      * tag 'hwmon-for-linus-v3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (g762) fix call to devm_hwmon_device_register_with_groups()
      a6e4a05a
    • L
      Merge tag 'clk-fixes-for-linus' of https://git.linaro.org/people/mike.turquette/linux · a7e90924
      Linus Torvalds 提交于
      Pull clock fixes from Mike Turquette:
       "The fixes for the clock framework are all regressions in drivers, plus
        a single fix in one of the basic clock templates.  No fixes to the
        core this time around.
      
        As with most clock driver fixes these run the gamut from fixing a
        build warning to fixing wrecked memory timings, with a little USB
        tossed in for fun"
      
      * tag 'clk-fixes-for-linus' of https://git.linaro.org/people/mike.turquette/linux:
        clk: pxa: fix pxa27x CCCR bit usage
        clk-divider: Fix READ_ONLY when divider > 1
        clk: qcom: Fix duplicate rbcpr clock name
        clk: at91: usb: fix at91sam9x5 recalc, round and set rate
        clk: at91: usb: fix at91rm9200 round and set rate
      a7e90924
    • T
      tg3: fix ring init when there are more TX than RX channels · a620a6bc
      Thadeu Lima de Souza Cascardo 提交于
      If TX channels are set to 4 and RX channels are set to less than 4,
      using ethtool -L, the driver will try to initialize more RX channels
      than it has allocated, causing an oops.
      
      This fix only initializes the RX ring if it has been allocated.
      Signed-off-by: NThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a620a6bc
    • E
      tcp: fix possible NULL dereference in tcp_vX_send_reset() · c3658e8d
      Eric Dumazet 提交于
      After commit ca777eff ("tcp: remove dst refcount false sharing for
      prequeue mode") we have to relax check against skb dst in
      tcp_v[46]_send_reset() if prequeue dropped the dst.
      
      If a socket is provided, a full lookup was done to find this socket,
      so the dst test can be skipped.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88191Reported-by: NJaša Bartelj <jasa.bartelj@gmail.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Reported-by: NDaniel Borkmann <dborkman@redhat.com>
      Fixes: ca777eff ("tcp: remove dst refcount false sharing for prequeue mode")
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c3658e8d
    • L
      rtlwifi: Change order in device startup · 7d63a5f9
      Larry Finger 提交于
      The existing order of steps when starting the PCI devices works for
      2.4G devices, but fails to initialize the 5G section of the RTL8821AE
      hardware.
      
      This patch is needed to fix the regression reported in Bug #88811
      (https://bugzilla.kernel.org/show_bug.cgi?id=88811).
      Reported-by: NValerio Passini <valerio.passini@unicam.it>
      Tested-by: NValerio Passini <valerio.passini@unicam.it>
      Signed-off-by: NLarry Finger <Larry.Finger@lwfinger.net>
      Cc: Valerio Passini <valerio.passini@unicam.it>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      7d63a5f9
    • L
      rtlwifi: rtl8821ae: Fix 5G detection problem · a91ed190
      Larry Finger 提交于
      The changes associated with moving this driver from staging to the regular
      tree missed one section setting the allowable rates for the 5GHz band.
      
      This patch is needed to fix the regression reported in Bug #88811
      (https://bugzilla.kernel.org/show_bug.cgi?id=88811).
      Reported-by: NValerio Passini <valerio.passini@unicam.it>
      Tested-by: NValerio Passini <valerio.passini@unicam.it>
      Signed-off-by: NLarry Finger <Larry.Finger@lwfinger.net>
      Cc: Valerio Passini <valerio.passini@unicam.it>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      a91ed190
    • P
      Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse" · 43612d7c
      Pablo Neira 提交于
      This reverts commit 5195c14c.
      
      If the conntrack clashes with an existing one, it is left out of
      the unconfirmed list, thus, crashing when dropping the packet and
      releasing the conntrack since golden rule is that conntracks are
      always placed in any of the existing lists for traceability reasons.
      Reported-by: NDaniel Borkmann <dborkman@redhat.com>
      Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=88841Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      43612d7c
    • D
      Merge branch 'ipv6_vxlan_outer_udp_csum' · 814f7d11
      David S. Miller 提交于
      Alexander Duyck says:
      
      ====================
      Fix outer UDP checksums for IPv6 VXLAN tunnels
      
      In testing against an older kernel I found a couple issues in the IPv6
      VXLAN tunnel checksum logic for the outer UDP checksum.
      
      First the default transitioned from using an outer checksum to not using
      one.  Second, sometime after that the checksum inputs were changed
      resulting the checksum not being correct if it were computed.
      
      These two issues prevented a ping from the newer kernel to the older one.
      With these two changes applied I verified I was able to send traffic over
      the VXLAN tunnel to a link partner on an older kernel.
      
      The boolean flip fix can be submitted for 3.17 stable as well since the
      patch that introduced the issue was included in that kernel.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      814f7d11
    • A
      vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX] · 3dc2b6a8
      Alexander Duyck 提交于
      In "vxlan: Call udp_sock_create" there was a logic error that resulted in
      the default for IPv6 VXLAN tunnels going from using checksums to not using
      checksums.  Since there is currently no support in iproute2 for setting
      these values it means that a kernel after the change cannot talk over a IPv6
      VXLAN tunnel to a kernel prior the change.
      
      Fixes: 3ee64f39 ("vxlan: Call udp_sock_create")
      
      Cc: Tom Herbert <therbert@google.com>
      Signed-off-by: NAlexander Duyck <alexander.h.duyck@redhat.com>
      Acked-by: NTom Herbert <therbert@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3dc2b6a8
    • A
      ip6_udp_tunnel: Fix checksum calculation · f3750817
      Alexander Duyck 提交于
      The UDP checksum calculation for VXLAN tunnels is currently using the
      socket addresses instead of the actual packet source and destination
      addresses.  As a result the checksum calculated is incorrect in some
      cases.
      
      Also uh->check was being set twice, first it was set to 0, and then it is
      set again in udp6_set_csum.  This change removes the redundant assignment
      to 0.
      
      Fixes: acbf74a7 ("vxlan: Refactor vxlan driver to make use of the common UDP tunnel functions.")
      
      Cc: Andy Zhou <azhou@nicira.com>
      Signed-off-by: NAlexander Duyck <alexander.h.duyck@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f3750817
    • A
      net-timestamp: Fix a documentation typo · 138a7f49
      Andrew Lutomirski 提交于
      SOF_TIMESTAMPING_OPT_ID puts the id in ee_data, not ee_info.
      
      Cc: Willem de Bruijn <willemb@google.com>
      Signed-off-by: NAndy Lutomirski <luto@amacapital.net>
      Acked-by: NWillem de Bruijn <willemb@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      138a7f49