1. 20 Jun, 2013 11 commits
  2. 19 Jun, 2013 7 commits
  3. 18 Jun, 2013 10 commits
  4. 17 Jun, 2013 12 commits
    • Chris Healy's avatar
      fec: Add support to restart autonegotiate · 32bc9b46
      Chris Healy authored
      Add ethtool operation to restart autonegotiation via the PHY.
      
      Tested on i.MX28EVK.
      Signed-off-by: default avatarChris Healy <cphealy@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32bc9b46
    • Veaceslav Falico's avatar
      bonding: don't call alb_set_slave_mac_addr() while atomic · cedb743f
      Veaceslav Falico authored
      alb_set_slave_mac_addr() sets the mac address in alb mode via
      dev_set_mac_address(), which might sleep. It's called from
      alb_handle_addr_collision_on_attach() in atomic context (under
      read_lock(bond->lock)), thus triggering a bug.
      
      Fix this by moving the lock inside alb_handle_addr_collision_on_attach().
      
      v1->v2:
      As Nikolay Aleksandrov noticed, we can drop the bond->lock completely.
      Also, use bond_slave_has_mac(), when possible.
      Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cedb743f
    • Sebastian Siewior's avatar
      net: cpsw: check for cpts pointer after its allocation · ab8e99d2
      Sebastian Siewior authored
      after priv->cpts got allocated then this pointer should check to determine
      if the allocation succeeded or not.
      
      Cc: Mugunthan V N <mugunthanvnm@ti.com>
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ab8e99d2
    • David S. Miller's avatar
      Merge branch 'for-davem' of... · c5b248dd
      David S. Miller authored
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into wireless
      
      John W. Linville says:
      
      ====================
      This will probably be the last batch of wireless fixes intended
      for 3.10.  Many of these are one- or two-liners, and a couple of
      others are mostly relocating existing code to avoid races or to
      limit the code to effecting specific hardware, etc.
      
      The mac80211 fixes have a couple of exceptions to the above.
      Regarding those, Johannes says:
      
      "Following davem's complaint about my patch, here's a new pull request
      w/o the patch he was complaining about, but instead with the const
      fix rolled into the fix.
      
      I have a fix for radar detection, one for rate control and a workaround
      for broken HT APs which is a regression fix because we didn't rely
      on them to be correct before."
      
      Johannes also sends some iwlwifi fixes:
      
      "I picked up Nikolay's patch for the chain noise calibration bug
      that seems to have been there forever, a fix from Emmanuel for
      setting TX flags on BAR frames and a fix of my own to avoid printing
      request_module() errors if the kernel isn't even modular. We also
      have our own version of Stanislaw's fix for rate control."
      
      Along with those...
      
      Anderson Lizardo fixes a Bluetooth memory corruption bug when an MTU
      value is set to too small of a value.
      
      Arend van Spriel sends a revised brcmsmac bug that fixes a regression
      caused by a bad return value in an earlier patch.  He also sends a
      brcmfmac fix to avoid an oops when loading the driver at boot.
      
      Daniel Drake fixes a race condition in btmrvl that causes hangs on
      suspend for OLPC hardware.
      
      Johan Hedberg adds a check to avoid sending a
      HCI_Delete_Stored_Link_Key command to devices that don't support them,
      avoiding some scary looking log spam.
      
      Stanislaw Gruszka gives us a fix for iwlegacy to be able to use rates
      higher than 1Mb/s on older wireless networks.  He also sends an rt2x00
      fix to reinstate older tx power handling behavior for some devices
      that didn't work well with the current code.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c5b248dd
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · e00c7f1f
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains Netfilter fixes. They are targeted to the
      TCP option targets, that have receive some scrinity in the last week. The
      changes are:
      
      * Fix TCPOPTSTRIP, it stopped working in the forward chain as tcp_hdr
        uses skb->transport_header, and we cannot use that in the forwarding
        case, from myself.
      
      * Fix default IPv6 MSS in TCPMSS in case of absence of TCP MSS options,
        from Phil Oester.
      
      * Fix missing fragmentation handling again in TCPMSS, from Phil Oester.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e00c7f1f
    • Johannes Berg's avatar
      alx: add a simple AR816x/AR817x device driver · ab69bde6
      Johannes Berg authored
      This is a very simple driver, based on the original vendor
      driver that Qualcomm/Atheros published/submitted previously,
      but reworked to make the code saner. However, it also lost
      a number of features (TSO/GSO, VLAN acceleration and multi-
      queue support) in the process, as well as debugging support
      features I didn't have any use for. The only thing I left
      is checksum offload.
      
      More features can obviously be added, but this seemed like
      a good start for having a driver in mainline at all.
      
      Johannes Stezenbach has verified that the driver works on
      AR8161, I have a AR8171 myself. The E2200 device ID I found
      on github in somebody's repository.
      Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ab69bde6
    • Michael Chan's avatar
      tg3: Prevent system hang during repeated EEH errors. · 72bb72b0
      Michael Chan authored
      The current tg3 code assumes the pci_error_handlers to be always called
      in sequence.  In particular, during ->error_detected(), NAPI is disabled
      and the device is shutdown.  The device is later reset and NAPI
      re-enabled in ->slot_reset() and ->resume().
      
      In EEH, if more than 6 errors are detected in a hour, only
      ->error_detected() will be called.  This will leave the driver in an
      inconsistent state as NAPI is disabled but netif_running state is still
      true.  When the device is later closed, we'll try to disable NAPI again
      and it will loop forever.
      
      We fix this by closing the device if we encounter any error conditions
      during the normal sequence of the pci_error_handlers.
      
      v2: Remove the changes in tg3_io_resume() based on Benjamin Poirier's
          feedback.
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      72bb72b0
    • Haiyang Zhang's avatar
      Fix the VLAN_TAG_PRESENT in netvsc_recv_callback() · 93725cbd
      Haiyang Zhang authored
      We should call __vlan_hwaccel_put_tag() only if the packet
      comes from vlan, otherwise VLAN_TAG_PRESENT will always be
      added.
      Reported-by: default avatarOlaf Hering <olaf@aepfle.de>
      Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
      Reviewed-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      93725cbd
    • stephen hemminger's avatar
      vxlan: handle skb_clone failure · 7aa27238
      stephen hemminger authored
      If skb_clone fails if out of memory then just skip the fanout.
      
      Problem was introduced in 3.10 with:
        commit 6681712d
        Author: David Stevens <dlstevens@us.ibm.com>
        Date:   Fri Mar 15 04:35:51 2013 +0000
      
          vxlan: generalize forwarding tables
      Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7aa27238
    • stephen hemminger's avatar
      vxlan: only migrate dynamic FDB entries · 26a41ae6
      stephen hemminger authored
      Only migrate dynamic forwarding table entries, don't modify
      static entries. If packet received from incorrect source IP address
      assume it is an imposter and drop it.
      
      This patch applies only to -net, a different patch would be needed for earlier
      kernels since the NTF_SELF flag was introduced with 3.10.
      Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      26a41ae6
    • stephen hemminger's avatar
      vxlan: fix race between flush and incoming learning · 3bf74b1a
      stephen hemminger authored
      It is possible for a packet to arrive during vxlan_stop(), and
      have a dynamic entry created. Close this by checking if device
      is up.
      
       CPU1                             CPU2
      vxlan_stop
        vxlan_flush
           hash_lock acquired
                                        vxlan_encap_recv
                                           vxlan_snoop
                                              waiting for hash_lock
           hash_lock relased
        vxlan_flush done
                                              hash_lock acquired
                                              vxlan_fdb_create
      
      This is a day-one bug in vxlan goes back to 3.7.
      Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3bf74b1a
    • David S. Miller's avatar
      Merge branch 'tipc' · c7b67aef
      David S. Miller authored
      Paul Gortmaker says:
      
      ====================
      This is a rework of the content sent earlier[1], with the following changes:
      
      	-drop the Kconfig --> modparam conversion patch; this was
      	 requested to be replaced[2] with a dynamic port quantity resizing.
      	 Ying and Erik were discussing how best to achieve this, and then
      	 vacation schedules got in the way, so implementing that will
      	 come (hopefully) in the next round.
      
      	-rework the sk_rcvbuf patch to allow memory resizing via sysctl
      	 as per what Ying and Neil discussed[3]
      
      	-add 4 more seemingly straigtforward and relatively small changes
      	 from Ying (the last 4 in the series).
      
      	-add cosmetic UAPI comment update patch from Ying.
      
      That said, the largest change is still the one where we make use of
      the fact that linux supports kernel threads and do the server like
      operations within kernel threads.  As Jon says:
      
         We remove the last remnants of the TIPC native API, to make it
         possible to simplify locking policy and solve a problem with lost
         topology events.
      
         First, we introduce a socket-based alternative to the native API.
      
         Second, we convert the two remaining users of the native API, the
         TIPC internal topology server and the configuarion server, to use the
         new API.
      
         Third, we remove the remaining code pertaining to the native API.
      
      I have re-tested this collection of commits between 32 and 64 bit x86
      machines using the standard tipc test suite, and build tested for ppc.
      
      [1] http://patchwork.ozlabs.org/patch/247687/
      [2] http://patchwork.ozlabs.org/patch/247680/
      [3] http://patchwork.ozlabs.org/patch/247688/
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c7b67aef