1. 04 8月, 2015 16 次提交
  2. 03 8月, 2015 2 次提交
  3. 01 8月, 2015 22 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5510b3c2
      David S. Miller 提交于
      Conflicts:
      	arch/s390/net/bpf_jit_comp.c
      	drivers/net/ethernet/ti/netcp_ethss.c
      	net/bridge/br_multicast.c
      	net/ipv4/ip_fragment.c
      
      All four conflicts were cases of simple overlapping
      changes.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5510b3c2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7c764cec
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Must teardown SR-IOV before unregistering netdev in igb driver, from
          Alex Williamson.
      
       2) Fix ipv6 route unreachable crash in IPVS, from Alex Gartrell.
      
       3) Default route selection in ipv4 should take the prefix length, table
          ID, and TOS into account, from Julian Anastasov.
      
       4) sch_plug must have a reset method in order to purge all buffered
          packets when the qdisc is reset, likewise for sch_choke, from WANG
          Cong.
      
       5) Fix deadlock and races in slave_changelink/br_setport in bridging.
          From Nikolay Aleksandrov.
      
       6) mlx4 bug fixes (wrong index in port even propagation to VFs,
          overzealous BUG_ON assertion, etc.) from Ido Shamay, Jack
          Morgenstein, and Or Gerlitz.
      
       7) Turn off klog message about SCTP userspace interface compat that
          makes no sense at all, from Daniel Borkmann.
      
       8) Fix unbounded restarts of inet frag eviction process, causing NMI
          watchdog soft lockup messages, from Florian Westphal.
      
       9) Suspend/resume fixes for r8152 from Hayes Wang.
      
      10) Fix busy loop when MSG_WAITALL|MSG_PEEK is used in TCP recv, from
          Sabrina Dubroca.
      
      11) Fix performance regression when removing a lot of routes from the
          ipv4 routing tables, from Alexander Duyck.
      
      12) Fix device leak in AF_PACKET, from Lars Westerhoff.
      
      13) AF_PACKET also has a header length comparison bug due to signedness,
          from Alexander Drozdov.
      
      14) Fix bug in EBPF tail call generation on x86, from Daniel Borkmann.
      
      15) Memory leaks, TSO stats, watchdog timeout and other fixes to
          thunderx driver from Sunil Goutham and Thanneeru Srinivasulu.
      
      16) act_bpf can leak memory when replacing programs, from Daniel
          Borkmann.
      
      17) WOL packet fixes in gianfar driver, from Claudiu Manoil.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (79 commits)
        stmmac: fix missing MODULE_LICENSE in stmmac_platform
        gianfar: Enable device wakeup when appropriate
        gianfar: Fix suspend/resume for wol magic packet
        gianfar: Fix warning when CONFIG_PM off
        act_pedit: check binding before calling tcf_hash_release()
        net: sk_clone_lock() should only do get_net() if the parent is not a kernel socket
        net: sched: fix refcount imbalance in actions
        r8152: reset device when tx timeout
        r8152: add pre_reset and post_reset
        qlcnic: Fix corruption while copying
        act_bpf: fix memory leaks when replacing bpf programs
        net: thunderx: Fix for crash while BGX teardown
        net: thunderx: Add PCI driver shutdown routine
        net: thunderx: Fix crash when changing rss with mutliple traffic flows
        net: thunderx: Set watchdog timeout value
        net: thunderx: Wakeup TXQ only if CQE_TX are processed
        net: thunderx: Suppress alloc_pages() failure warnings
        net: thunderx: Fix TSO packet statistic
        net: thunderx: Fix memory leak when changing queue count
        net: thunderx: Fix RQ_DROP miscalculation
        ...
      7c764cec
    • D
      Merge branch 'ipv6-auto-flow-labels' · 17f901e8
      David S. Miller 提交于
      Tom Herbert says:
      
      ====================
      ipv6: Turn on auto IPv6 flow labels by default
      
      BSD (MacOS) has already turned on flow labels by default and this does
      not seem to be causing any problems in the Internet. Let's go ahead
      and turn them on by default. We'll continue to monitor for any devices
      start choking on them.
      
      Flow labels are important since they are the desired solution for
      network devices to perform ECMP and RSS (RFC6437 and RFC6438).
      Traditionally, devices perform a 5-tuple hash on packets that
      includes port numbers. For the most part, these devices can only
      compute 5-tuple hashes for TCP and UDP. This severely limits our ability
      to get good network load balancing for other protocols (IPIP, GRE,ESP,
      etc.), and hence we are limited in using other protocols. Unfortunately,
      this method is accepted as the de facto standard to the extent that
      there are several proposals to encapsulate protocols in UDP _just_ for
      the purposes for getting ECMP to work. With hosts generating flow labels
      and devices taking them as input into ECMP (several already do), we can
      start to fix this fundamental problem.
      
      This patch set:
       - Changes IPV6_FLOWINFO sockopt to be opt-out of flow labels for
         connections rather than opt-in
       - Disable flow label state ranges sysctl by default
       - Enable auto flow labels sysctl by default
      
      v2:
        - Added functions to create an skb->hash based on flowi4 and flowi6.
          These are called in output path when creating a packet
        - Call skb_get_hash_flowi6 in ip6_make_flowlabel
        - Implement the auto_flowlabels sysctl as a mode for auto flowlabels.
          There are four modes which correspond to flow labels being enabled
          and whether socket option can be used to opt in or opt out of
          using them
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      17f901e8
    • T
      ipv6: Enable auto flow labels by default · b5677416
      Tom Herbert 提交于
      Initialize auto_flowlabels to one. This enables automatic flow labels,
      individual socket may disable them using the IPV6_AUTOFLOWLABEL socket
      option.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b5677416
    • T
      ipv6: Disable flowlabel state ranges by default · be26849b
      Tom Herbert 提交于
      Per RFC6437 stateful flow labels (e.g. labels set by flow label manager)
      cannot "disturb" nodes taking part in stateless flow labels. While the
      ranges only reduce the flow label entropy by one bit, it is conceivable
      that this might bias the algorithm on some routers causing a load
      imbalance. For best results on the Internet we really need the full
      20 bits.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      be26849b
    • T
      ipv6: Implement different admin modes for automatic flow labels · 42240901
      Tom Herbert 提交于
      Change the meaning of net.ipv6.auto_flowlabels to provide a mode for
      automatic flow labels generation. There are four modes:
      
      0: flow labels are disabled
      1: flow labels are enabled, sockets can opt-out
      2: flow labels are allowed, sockets can opt-in
      3: flow labels are enabled and enforced, no opt-out for sockets
      
      np->autoflowlabel is initialized according to the sysctl value.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      42240901
    • T
      ipv6: Call skb_get_hash_flowi6 to get skb->hash in ip6_make_flowlabel · 67800f9b
      Tom Herbert 提交于
      We can't call skb_get_hash here since the packet is not complete to do
      flow_dissector. Create hash based on flowi6 instead.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      67800f9b
    • T
      net: Add functions to get skb->hash based on flow structures · f70ea018
      Tom Herbert 提交于
      Add skb_get_hash_flowi6 and skb_get_hash_flowi4 which derive an sk_buff
      hash from flowi6 and flowi4 structures respectively. These functions
      can be called when creating a packet in the output path where the new
      sk_buff does not yet contain a fully formed packet that is parsable by
      flow dissector.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f70ea018
    • L
      Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · acea568f
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "Filipe fixed up a hard to trigger ENOSPC regression from our merge
        window pull, and we have a few other smaller fixes"
      
      * 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix quick exhaustion of the system array in the superblock
        btrfs: its btrfs_err() instead of btrfs_error()
        btrfs: Avoid NULL pointer dereference of free_extent_buffer when read_tree_block() fail
        btrfs: Fix lockdep warning of btrfs_run_delayed_iputs()
      acea568f
    • L
      Merge tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c6fd4fc7
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This became a relative big update as it includes the collected ASoC
        fixes.  There are a few fixes in ASoC core side, mostly for DAPM and
        the new topology API.  The rest are various ASoC driver-specific
        fixes, as well as the usual HD-audio and USB-audio quirks"
      
      * tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
        ALSA: hda - Fix MacBook Pro 5,2 quirk
        ALSA: hda - Fix race between PM ops and HDA init/probe
        ALSA: usb-audio: add dB range mapping for some devices
        ALSA: hda - Apply a fixup to Dell Vostro 5480
        ALSA: hda - Add pin quirk for the headset mic jack detection on Dell laptop
        ALSA: hda - Apply fixup for another Toshiba Satellite S50D
        ALSA: fireworks: add support for AudioFire2 quirk
        ALSA: hda - Fix the headset mic that will not work on Dell desktop machine
        ALSA: hda - fix cs4210_spdif_automute()
        ASoC: pcm1681: Fix setting de-emphasis sampling rate selection
        ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt
        ASoC: sgtl5000: Fix up define for SGTL5000_SMALL_POP
        ASoC: dapm: Don't add prefix to widget stream name
        ASoC: rt5645: Check if codec is initialized in workqueue handler
        ASoC: Intel: Get correct usage_count value to load firmware
        ASoC: topology: Fix to add dapm mixer info
        ASoC: zx: spdif: Fix devm_ioremap_resource return value check
        ASoC: zx: i2s: Fix devm_ioremap_resource return value check
        ASoC: mediatek: Use platform_of_node for machine drivers
        ASoC: Free card DAPM context on snd_soc_instantiate_card() error path
        ...
      c6fd4fc7
    • D
      Merge branch 'dsa-netconsole' · db316d57
      David S. Miller 提交于
      Florian Fainelli says:
      
      ====================
      net: GENET, SYSTEMPORT and DSA netconsole
      
      This patch series adds support for netconsole in the GENET, SYSTEMPORT and DSA
      drivers.
      
      A small refactoring to the DSA transmit path is required to avoid duplicating
      the dsa_netpoll_send_skb() into each and every tagging protocol supported.
      
      Testing on e.g: mv643xx_eth and/or e1000e would be much appreciated!
      
      Changes in v2:
      
      - properly disable/enable interrupts in GENET and SYSTEMPORT
      
      - pass the reallocated SKB back to dsa_slave_xmit() in case a tag protocol had to
        alter the original SKB
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      db316d57
    • F
      net: dsa: Add netconsole support · 04ff53f9
      Florian Fainelli 提交于
      Add support for using DSA slave network devices with netconsole, which
      requires us to allocate and free custom netpoll instances and invoke the
      parent network device poll controller callback.
      
      In order for netconsole to work, we need to construct the DSA tag, but
      not queue the skb for transmission on the master network device xmit
      function.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      04ff53f9
    • F
      net: dsa: Refactor transmit path to eliminate duplication · 4ed70ce9
      Florian Fainelli 提交于
      All tagging protocols do the same thing: increment device statistics,
      make room for the tag to be inserted, create the tag, invoke the parent
      network device transmit function.
      
      In order to prepare for adding netpoll support, which requires the tag
      creation, but not using the parent network device transmit function, do
      some little refactoring which eliminates duplication between the 4
      tagging protocols supported.
      
      We need to return a sk_buff pointer back to the caller because the tag
      specific transmit function may have to reallocate the original skb (e.g:
      tag_trailer.c) and this is the one we should be transmitting, not the
      original sk_buff we were passed.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4ed70ce9
    • F
      net: systemport: Add netconsole support · 6cec4f5e
      Florian Fainelli 提交于
      Implement a poll controller for netconsole which invokes the RX
      interrupt handler to poll for incoming packets, and cleans up all TX
      queues by invoking the TX interrupt handler.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6cec4f5e
    • F
      net: bcmgenet: Add netconsole support · 4d2e8882
      Florian Fainelli 提交于
      Implement a poll controller for netconsole which invokes both of our
      interrupt handlers for the different RX/TX queues.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4d2e8882
    • J
      stmmac: fix missing MODULE_LICENSE in stmmac_platform · ea111545
      Joachim Eastwood 提交于
      Commit 50649ab1 ("stmmac: drop driver from stmmac platform code")
      was a bit overzealous in removing code and dropped the MODULE_*
      macro's that are still needed since stmmac_platform can be a module.
      Fix this by putting the macro's remvoed in 50649ab1 back.
      
      This fixes the following errors when used as a module:
        stmmac_platform: module license 'unspecified' taints kernel.
        Disabling lock debugging due to kernel taint
        stmmac_platform: Unknown symbol devm_kmalloc (err 0)
        stmmac_platform: Unknown symbol stmmac_suspend (err 0)
        stmmac_platform: Unknown symbol platform_get_irq_byname (err 0)
        stmmac_platform: Unknown symbol stmmac_dvr_remove (err 0)
        stmmac_platform: Unknown symbol platform_get_resource (err 0)
        stmmac_platform: Unknown symbol of_get_phy_mode (err 0)
        stmmac_platform: Unknown symbol of_property_read_u32_array (err 0)
        stmmac_platform: Unknown symbol of_alias_get_id (err 0)
        stmmac_platform: Unknown symbol stmmac_resume (err 0)
        stmmac_platform: Unknown symbol stmmac_dvr_probe (err 0)
      
      Fixes: 50649ab1 ("stmmac: drop driver from stmmac platform code")
      Reported-by: NIgor Gnatenko <i.gnatenko.brain@gmail.com>
      Signed-off-by: NJoachim Eastwood <manabian@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ea111545
    • D
      Merge branch 'gianfar-wol-fixes' · ef1f4364
      David S. Miller 提交于
      Claudiu Manoil says:
      
      ====================
      gianfar: wol magic packet fixes
      
      These changes were already validated as part of FSL SDK.
      Patch 2 fixes occasional wake-on magic packet failures during
      traffic, probably due to incorrect traffic stop/ device halt
      sequence and incorrect usage of txlock.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ef1f4364
    • C
      gianfar: Enable device wakeup when appropriate · b0734b6d
      Claudiu Manoil 提交于
      The wol_en flag is 0 by default anyway, and we have the
      following inconsistency: a MAGIC packet wol capable eth
      interface is registered as a wake-up source but unable
      to wake-up the system as wol_en is 0 (wake-on flag set to 'd').
      Calling set_wakeup_enable() at netdev open is just redundant
      because wol_en is 0 by default.
      Let only ethtool call set_wakeup_enable() for now.
      
      The bflock is obviously obsoleted, its utility has been corroded
      over time.  The bitfield flags used today in gianfar are accessed
      only on the init/ config path, with no real possibility of
      concurrency - nothing that would justify smth. like bflock.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b0734b6d
    • C
      gianfar: Fix suspend/resume for wol magic packet · 614b4242
      Claudiu Manoil 提交于
      If we disable NAPI in the first place we can mask the device's
      interrupts (and halt it) without fearing that imask may be
      concurrently accessed from interrupt context, so there's
      no need to do local_irq_save() around gfar_halt_nodisable().
      lock_rx_qs()/unlock_tx_qs() are just obsoleted and potentially
      buggy routines.  The txlock is currently used in the driver only
      to manage TX congestion, it has nothing to do with halting the
      device.  With these changes, the TX processing is stopped before
      gfar_halt().
      
      Compact gfar_halt() is used instead of gfar_halt_nodisable(),
      as it disables Rx/TX DMA h/w blocks and the Rx/TX h/w queues.
      gfar_start() re-enables all these blocks on resume.  Enabling
      the magic-packet mode remains the same, note that the RX block
      is re-enabled just before entering sleep mode.
      
      Add IRQF_NO_SUSPEND flag for the error interrupt line, to signal
      that the interrupt line must remain active during sleep in order
      to wake the system by magic packet (MAG) reception interrupt.
      (On some systems the MAG interrupt did trigger w/o this flag
      as well, but on others it didn't.)
      
      Without these fixes, when suspended during fair Tx traffic the
      interface occasionally failed to be woken up by magic packet.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      614b4242
    • C
      gianfar: Fix warning when CONFIG_PM off · 84868305
      Claudiu Manoil 提交于
      CC      drivers/net/ethernet/freescale/gianfar.o
      drivers/net/ethernet/freescale/gianfar.c:568:13: warning: 'lock_tx_qs'
      defined but not used [-Wunused-function]
       static void lock_tx_qs(struct gfar_private *priv)
                   ^
      drivers/net/ethernet/freescale/gianfar.c:576:13: warning: 'unlock_tx_qs'
      defined but not used [-Wunused-function]
       static void unlock_tx_qs(struct gfar_private *priv)
                   ^
      Reported-by: NScott Wood <scottwood@freescale.com>
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      84868305
    • N
      bonding: add tlb_dynamic_lb netlink support · 0f7bffd9
      Nikolay Aleksandrov 提交于
      tlb_dynamic_lb could be set only via sysfs, this patch allows it to be
      set via netlink.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0f7bffd9
    • D
      Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of... · b7a0925e
      David S. Miller 提交于
      Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
      
      Kalle Valo says:
      
      ====================
      Major changes:
      
      mwifiex:
      
      * add TX DATA Pause support
      * add multichannel and TDLS channel switch support
      
      ath10k:
      
      * enable VHT for IBSS
      * initial work to support qca99x0 and the corresponding 10.4 firmware branch
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b7a0925e