1. 12 Apr, 2013 7 commits
  2. 11 Apr, 2013 27 commits
  3. 10 Apr, 2013 3 commits
    • David S. Miller's avatar
      Merge branch 'wireless' · e355fbbc
      David S. Miller authored
      John W. Linville says:
      
      ====================
      Please accept this pull request for the 3.10 stream...
      
      Regarding the mac80211 bits, Johannes says:
      
      "Here I have a bunch of minstrel fixes from Felix, per-interface
      multicast filtering from Alex, set_tim debouncing from Ilan,
      per-interface debugfs cleanups from Stanislaw, an error return fix from
      Wei and a number of small improvements and fixes that I made myself."
      
      And for the iwlwifi bits, Johannes says:
      
      "Andrei changed an instance of kmalloc+memdup to kmemdup, Stanislaw
      removed the now unused 5ghz_disable module parameter. I also have a
      number of fixes from Ilan, Emmanuel and myself, Emmanuel also continued
      working on Bluetooth coexistence."
      
      For the sizeable batch of Bluetooth bits, Gustavo says:
      
      "This is our first batch of patches for 3.10. The biggest changes of this pull
      request are from Johan Hedberg, he implemented a HCI request framework to make
      life easier when we have to send many HCI commands and a block and wait for
      all of the to finish, we were able to fix a few issues in stack with the
      introduction of this framework.
      
      Other than that Dean Jenkins did a good work cleaning the RFCOMM code, the
      refcnt infrastructure was removed and now we use NULL pointer checks to know
      when a object was freed or not. That code was buggy and now it looks a way
      better.
      
      The rest of changes are clean ups, fixes and small improvements all over the
      Bluetooth subsystem."
      
      Regarding the wl12xx bits, Luca says:
      
      "Some patches intended for 3.10.  Mostly bug fixes and other small
      improvements."
      
      On top of that, there are updates to brcmfmac, brcmsmac, b43, ssb and
      bcma, as well as mwifiex, rt2x00, and ath9k and a few others.  The most
      notable bit is the addition of a new driver in the rtlwifi family.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e355fbbc
    • John W. Linville's avatar
      Merge branch 'master' of... · d3641409
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      
      Conflicts:
      	drivers/net/wireless/rt2x00/rt2x00pci.c
      	net/mac80211/sta_info.c
      	net/wireless/core.h
      d3641409
    • John W. Linville's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 6fe5468f
      John W. Linville authored
      Conflicts:
      	drivers/net/wireless/rt2x00/rt2x00pci.c
      6fe5468f
  4. 09 Apr, 2013 3 commits
    • Joe Perches's avatar
      tg3: Use bool not int · 953c96e0
      Joe Perches authored
      Using bool can make code more readable.
      
      Convert uses and tests of int to bool.
      
      This also makes a comparison of tg3->link_up
      (itself bool) a bool comparison instead of int.
      
      Reorder stack variable declarations to make
      bool fit declaration holes where appropriate.
      
      $ size drivers/net/ethernet/broadcom/tg3.o*
         text	   data	    bss	    dec	    hex	filename
       169958	  27249	  58896	 256103	  3e867	drivers/net/ethernet/broadcom/tg3.o.new
       169968	  27249	  58896	 256113	  3e871	drivers/net/ethernet/broadcom/tg3.o.old
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      953c96e0
    • David S. Miller's avatar
      Merge branch 'tg3' · 712c4b74
      David S. Miller authored
      Nithin Nayak Sujir says:
      
      ====================
      This patch and the following two patches add support for link flap avoidance
      by maintaining the link on power down. This feature is required for
      management capable devices to have the management connection
      uninterrupted on driver reload, reboot and interface up/down.
      
      The other pros of this feature are
       - It speeds up boot up time by several seconds as DHCP addresses can be
         acquired faster.
       - It avoids lengthy Spanning Tree delay.
      
      On powerup the hardware brings up the phy with default settings. If the
      link is not up, the management software configures the phy to gigabit
      and starts autonegotiate. Subsequently, as long as the link is up, the
      driver and management refrain from resetting and/or changing any
      configuration that the link depends on.
      
      The LNK_FLAP_AVOID setting is an NVRAM user configurable bit and is
      disabled by default.  If this setting is enabled, we skip powering down
      the phy and resetting it.
      
      A second NVRAM setting is 1G_ON_VAUX_OK (off by default). This adds
      support for gigabit link speed when device is on auxiliary power.
      ====================
      Signed-off-by: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
      Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      712c4b74
    • Nithin Sujir's avatar