1. 08 Feb, 2015 5 commits
    • Jarno Rajahalme's avatar
      net: openvswitch: Support masked set actions. · 83d2b9ba
      Jarno Rajahalme authored
      OVS userspace already probes the openvswitch kernel module for
      OVS_ACTION_ATTR_SET_MASKED support.  This patch adds the kernel module
      implementation of masked set actions.
      
      The existing set action sets many fields at once.  When only a subset
      of the IP header fields, for example, should be modified, all the IP
      fields need to be exact matched so that the other field values can be
      copied to the set action.  A masked set action allows modification of
      an arbitrary subset of the supported header bits without requiring the
      rest to be matched.
      
      Masked set action is now supported for all writeable key types, except
      for the tunnel key.  The set tunnel action is an exception as any
      input tunnel info is cleared before action processing starts, so there
      is no tunnel info to mask.
      
      The kernel module converts all (non-tunnel) set actions to masked set
      actions.  This makes action processing more uniform, and results in
      less branching and duplicating the action processing code.  When
      returning actions to userspace, the fully masked set actions are
      converted back to normal set actions.  We use a kernel internal action
      code to be able to tell the userspace provided and converted masked
      set actions apart.
      Signed-off-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      83d2b9ba
    • David S. Miller's avatar
      Merge branch 'dsa-next' · 2150f984
      David S. Miller authored
      Florian Fainelli says:
      
      ====================
      net: dsa: bcm_sf2: GPHY power down
      
      This patch series implement GPHY power up and down in the SF2 switch
      driver in order to conserve power whenever possible (e.g: port is brought
      down or unused during Wake-on-LAN).
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2150f984
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: implement GPHY power down · 9af197a8
      Florian Fainelli authored
      Implement the power on/off recommended procedure for the Single GPHY we
      have on our Starfighter 2 switch. In order to make sure we get proper
      LED link/activity signaling during suspend, switch the link indication
      from the Switch/MAC to the PHY.
      
      Finally, since the GPHY needs to be reset to be put in low power mode,
      we will loose any context applied to it: workarounds, EEE etc.. so we
      need to call phy_init_hw() to get our fixups re-applied successfully.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9af197a8
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: move GPHY enabling to its own function · b083668c
      Florian Fainelli authored
      Move the code that touches the single GPHY register from
      bcm_sf2_sw_resume() to a separate function since we will have to
      enable/disable the GPHY from different locations, and we want the code
      to be self-contained.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b083668c
    • David S. Miller's avatar
      Merge tag 'nfc-next-3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · 3c09e92f
      David S. Miller authored
      NFC: 3.20 second pull request
      
      This is the second NFC pull request for 3.20.
      
      It brings:
      
      - NCI NFCEE (NFC Execution Environment, typically an embedded or
        external secure element) discovery and enabling/disabling support.
        In order to communicate with an NFCEE, we also added NCI's logical
        connections support to the NCI stack.
      
      - HCI over NCI protocol support. Some secure elements only understand
        HCI and thus we need to send them HCI frames when they're part of
        an NCI chipset.
      
      - NFC_EVT_TRANSACTION userspace API addition. Whenever an application
        running on a secure element needs to notify its host counterpart,
        we send an NFC_EVENT_SE_TRANSACTION event to userspace through the
        NFC netlink socket.
      
      - Secure element and HCI transaction event support for the st21nfcb
        chipset.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3c09e92f
  2. 06 Feb, 2015 27 commits
  3. 05 Feb, 2015 8 commits
    • Takashi Iwai's avatar
      hso: Use static attribute groups for sysfs entry · 4134069f
      Takashi Iwai authored
      Pass the static attribute groups and the driver data via
      tty_port_register_device_attr() instead of manual device_create_file()
      and device_remove_file() calls.
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4134069f
    • David S. Miller's avatar
      Merge branch 'isdnloop_checkpatch' · b0ebfaea
      David S. Miller authored
      Bas Peters says:
      
      ====================
      Fix checkpatch errors in drivers/isdn/isdnloop
      
      This patchset adresses various checkpatch errors in the abovementioned driver.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b0ebfaea
    • Bas Peters's avatar
      drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values,... · 3581ec58
      Bas Peters authored
      drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.
      Signed-off-by: default avatarBas Peters <baspeters93@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3581ec58
    • Bas Peters's avatar
    • Bas Peters's avatar
      drivers: isdn: isdnloop: isdnloop.c: remove assignment of variables in if... · 50a58b6b
      Bas Peters authored
      drivers: isdn: isdnloop: isdnloop.c: remove assignment of variables in if conditions, in accordance with the CodingStyle.
      Signed-off-by: default avatarBas Peters <baspeters93@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      50a58b6b
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6e03f896
      David S. Miller authored
      Conflicts:
      	drivers/net/vxlan.c
      	drivers/vhost/net.c
      	include/linux/if_vlan.h
      	net/core/dev.c
      
      The net/core/dev.c conflict was the overlap of one commit marking an
      existing function static whilst another was adding a new function.
      
      In the include/linux/if_vlan.h case, the type used for a local
      variable was changed in 'net', whereas the function got rewritten
      to fix a stacked vlan bug in 'net-next'.
      
      In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
      overlapped with an endainness fix for VHOST 1.0 in 'net'.
      
      In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
      in 'net-next' whereas in 'net' there was a bug fix to pass in the
      correct network namespace pointer in calls to this function.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e03f896
    • Linus Torvalds's avatar
      MMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9d82f5eb
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Stretch ACKs can kill performance with Reno and CUBIC congestion
          control, largely due to LRO and GRO.  Fix from Neal Cardwell.
      
       2) Fix userland breakage because we accidently emit zero length netlink
          messages from the bridging code.  From Roopa Prabhu.
      
       3) Carry handling in generic csum_tcpudp_nofold is broken, fix from
          Karl Beldan.
      
       4) Remove bogus dev_set_net() calls from CAIF driver, from Nicolas
          Dichtel.
      
       5) Make sure PPP deflation never returns a length greater then the
          output buffer, otherwise we overflow and trigger skb_over_panic().
          Fix from Florian Westphal.
      
       6) COSA driver needs VIRT_TO_BUS Kconfig dependencies, from Arnd
          Bergmann.
      
       7) Don't increase route cached MTU on datagram too big ICMPs.  From Li
          Wei.
      
       8) Fix error path leaks in nf_tables, from Pablo Neira Ayuso.
      
       9) Fix bitmask handling regression in netlink that broke things like
          acpi userland tools.  From Pablo Neira Ayuso.
      
      10) Wrong header pointer passed to param_type2af() in SCTP code, from
          Saran Maruti Ramanara.
      
      11) Stacked vlans not handled correctly by vlan_get_protocol(), from
          Toshiaki Makita.
      
      12) Add missing DMA memory barrier to xgene driver, from Iyappan
          Subramanian.
      
      13) Fix crash in rate estimators, from Eric Dumazet.
      
      14) We've been adding various workarounds, one after another, for the
          change which added the per-net tcp_sock.  It was meant to reduce
          socket contention but added lots of problems.
      
          Reduce this instead to a proper per-cpu socket and that rids us of
          all the daemons.
      
          From Eric Dumazet.
      
      15) Fix memory corruption and OOPS in mlx4 driver, from Jack
          Morgenstein.
      
      16) When we disabled UFO in the virtio_net device, it introduces some
          serious performance regressions.  The orignal problem was IPV6
          fragment ID generation, so fix that properly instead.  From Vlad
          Yasevich.
      
      17) sr9700 driver build breaks on xtensa because it defines macros with
          the same name as those used by the arch code.  Use more unique
          names.  From Chen Gang.
      
      18) Fix endianness in new virio 1.0 mode of the vhost net driver, from
          Michael S Tsirkin.
      
      19) Several sysctls were setting the maxlen attribute incorrectly, from
          Sasha Levin.
      
      20) Don't accept an FQ scheduler quantum of zero, that leads to crashes.
          From Kenneth Klette Jonassen.
      
      21) Fix dumping of non-existing actions in the packet scheduler
          classifier.  From Ignacy Gawędzki.
      
      22) Return the write work_done value when doing TX work in the qlcnic
          driver.
      
      23) ip6gre_err accesses the info field with the wrong endianness, from
          Sabrina Dubroca.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
        sit: fix some __be16/u16 mismatches
        ipv6: fix sparse errors in ip6_make_flowlabel()
        net: remove some sparse warnings
        flow_keys: n_proto type should be __be16
        ip6_gre: fix endianness errors in ip6gre_err
        qlcnic: Fix NAPI poll routine for Tx completion
        amd-xgbe: Set RSS enablement based on hardware features
        amd-xgbe: Adjust for zero-based traffic class count
        cls_api.c: Fix dumping of non-existing actions' stats.
        pkt_sched: fq: avoid hang when quantum 0
        net: rds: use correct size for max unacked packets and bytes
        vhost/net: fix up num_buffers endian-ness
        gianfar: correct the bad expression while writing bit-pattern
        net: usb: sr9700: Use 'SR_' prefix for the common register macros
        Revert "drivers/net: Disable UFO through virtio"
        Revert "drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets"
        ipv6: Select fragment id during UFO segmentation if not set.
        xen-netback: stop the guest rx thread after a fatal error
        net/mlx4_core: Fix kernel Oops (mem corruption) when working with more than 80 VFs
        isdn: off by one in connect_res()
        ...
      9d82f5eb
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 14365ea2
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This patch set is fixing two serious problems which have turned up
        late in the release cycle.
      
        The first fixes a problem with 4k sector disks where the transfer
        length (amount of data sent to the disk) was getting increased every
        time the disk was revalidated leading to potential for overflows.
      
        The other is a regression oops fix for some of our last merge window
        code"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        sd: Fix max transfer length for 4k disks
        scsi: fix device handler detach oops
      14365ea2