Skip to content
  1. May 11, 2015
  2. May 10, 2015
  3. May 07, 2015
  4. May 06, 2015
  5. May 05, 2015
    • David S. Miller's avatar
      Merge tag 'mac80211-for-davem-2015-05-04' of... · b7ba7b46
      David S. Miller authored
      
      Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
      
      Johannes Berg says:
      
      ====================
      We have only a few fixes right now:
       * a fix for an issue with hash collision handling in the
         rhashtable conversion
       * a merge issue - rhashtable removed default shrinking
         just before mac80211 was converted, so enable it now
       * remove an invalid WARN that can trigger with legitimate
         userspace behaviour
       * add a struct member missing from kernel-doc that caused
         a lot of warnings
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b7ba7b46
    • Yuval Mintz's avatar
      bnx2x: Fix to prevent inner-reload · 0650c0b8
      Yuval Mintz authored
      Submit 909d9faa
      
       ("bnx2x: Prevent inner-reload while VFs exist")
      contained a bug - MTU change was not prevented by it; Instead, it
      `randomally' prevented bnx2x_resume() from running [harmless yet wrong].
      
      This moves the check to its correct spot.
      
      Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0650c0b8
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 73e84313
      David S. Miller authored
      
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-05-04
      
      Here's the first bluetooth-next pull request for 4.2:
      
       - Various fixes for at86rf230 driver
       - ieee802154: trace events support for rdev->ops
       - HCI UART driver refactoring
       - New Realtek IDs added to btusb driver
       - Off-by-one fix for rtl8723b in btusb driver
       - Refactoring of btbcm driver for both UART & USB use
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      73e84313
    • David Ahern's avatar
      net/rds: Fix new sparse warning · e2783717
      David Ahern authored
      c0adf54a
      
       introduced new sparse warnings:
        CHECK   /home/dahern/kernels/linux.git/net/rds/ib_cm.c
      net/rds/ib_cm.c:191:34: warning: incorrect type in initializer (different base types)
      net/rds/ib_cm.c:191:34:    expected unsigned long long [unsigned] [usertype] dp_ack_seq
      net/rds/ib_cm.c:191:34:    got restricted __be64 <noident>
      net/rds/ib_cm.c:194:51: warning: cast to restricted __be64
      
      The temporary variable for sequence number should have been declared as __be64
      rather than u64. Make it so.
      
      Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
      Cc: shamir rabinovitch <shamir.rabinovitch@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e2783717
    • David S. Miller's avatar
      Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way"" · a2d4fcb8
      David S. Miller authored
      This reverts commit 8d7d9cca
      
      .
      
      Now that the necessary infrastructure is really all there
      in the tree, we can put this change back in.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a2d4fcb8
    • Kamlakant Patel's avatar
      net/smsc911x: fix irq resource allocation failure · 965b2aa7
      Kamlakant Patel authored
      When smsc911x uses GPIO as the interrupt controller, and if both are
      loaded as modules, we get following error:
      
      "smsc911x: Could not allocate irq resource"
      
      This issue is because of smsc911x using platform_get_resource to get
      device tree based irq resource.
      
      commit "9ec36caf
      
       (of/irq: do irq resolution in platform_get_irq)" and
      commit "7085a7 (drivers: platform: parse IRQ flags from resources)" add
      support in platform_get_irq to resolve irq and irq_flags respectively
      for both modern device tree and legacy static platform data platforms.
      
      Modify smsc911x driver to use platform_get_irq to pick up irq resource
      correctly and use irq_get_trigger_type to get the IRQ trigger flags.
      
      Signed-off-by: default avatarKamlakant Patel <kamlakant.patel@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      965b2aa7
    • Vlad Yasevich's avatar
      net: core: Correct an over-stringent device loop detection. · d66bf7dd
      Vlad Yasevich authored
      
      
      The code in __netdev_upper_dev_link() has an over-stringent
      loop detection logic that actually prevents valid configurations
      from working correctly.
      
      In particular, the logic returns an error if an upper device
      is already in the list of all upper devices for a given dev.
      This particular check seems to be a overzealous as it disallows
      perfectly valid configurations.  For example:
        # ip l a link eth0 name eth0.10 type vlan id 10
        # ip l a dev br0 typ bridge
        # ip l s eth0.10 master br0
        # ip l s eth0 master br0  <--- Will fail
      
      If you switch the last two commands (add eth0 first), then both
      will succeed.  If after that, you remove eth0 and try to re-add
      it, it will fail!
      
      It appears to be enough to simply check adj_list to keeps things
      safe.
      
      I've tried stacking multiple devices multiple times in all different
      combinations, and either rx_handler registration prevented the stacking
      of the device linking cought the error.
      
      Signed-off-by: default avatarVladislav Yasevich <vyasevic@redhat.com>
      Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
      Acked-by: default avatarVeaceslav Falico <vfalico@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d66bf7dd
    • Tilman Schmidt's avatar
      isdn/gigaset: cede maintainership · 6b096fde
      Tilman Schmidt authored
      
      
      As German phone operators are discontinuing ISDN service, neither
      Hansjörg nor I will be able to maintain the Gigaset ISDN drivers
      any longer. Paul Bolle offered to step into the breach for odd
      fixes.
      
      Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
      Acked-by: default avatarPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b096fde
  6. May 04, 2015