1. 11 4月, 2015 4 次提交
  2. 10 4月, 2015 25 次提交
  3. 09 4月, 2015 11 次提交
    • M
      Bluetooth: btusb: Use proper data structures for Intel vendor events · ccd6da2a
      Marcel Holtmann 提交于
      The Intel vendors events indicating firmware loading result and the
      bootup of the operational firmware are currently hardcoded byte
      comparisons. So intead of doing that, provide proper data structures
      and actually use them.
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      ccd6da2a
    • V
      mac802154: fix typo for device · 94910d41
      Varka Bhadram 提交于
      Signed-off-by: NVarka Bhadram <varkab@cdac.in>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      94910d41
    • M
      Bluetooth: Read LE remote features during connection establishment · 0fe29fd1
      Marcel Holtmann 提交于
      When establishing a Bluetooth LE connection, read the remote used
      features mask to determine which features are supported. This was
      not really needed with Bluetooth 4.0, but since Bluetooth 4.1 and
      also 4.2 have introduced new optional features, this becomes more
      important.
      
      This works the same as with BR/EDR where the connection enters the
      BT_CONFIG stage and hci_connect_cfm call is delayed until the remote
      features have been retrieved. Only after successfully receiving the
      remote features, the connection enters the BT_CONNECTED state.
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      0fe29fd1
    • W
      vxlan: do not exit on error in vxlan_stop() · f13b1689
      WANG Cong 提交于
      We need to clean up vxlan despite vxlan_igmp_leave() fails.
      
      This fixes the following kernel warning:
      
       WARNING: CPU: 0 PID: 6 at lib/debugobjects.c:263 debug_print_object+0x7c/0x8d()
       ODEBUG: free active (active state 0) object type: timer_list hint: vxlan_cleanup+0x0/0xd0
       CPU: 0 PID: 6 Comm: kworker/u8:0 Not tainted 4.0.0-rc7+ #953
       Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
       Workqueue: netns cleanup_net
        0000000000000009 ffff88011955f948 ffffffff81a25f5a 00000000253f253e
        ffff88011955f998 ffff88011955f988 ffffffff8107608e 0000000000000000
        ffffffff814deba2 ffff8800d4e94000 ffffffff82254c30 ffffffff81fbe455
       Call Trace:
        [<ffffffff81a25f5a>] dump_stack+0x4c/0x65
        [<ffffffff8107608e>] warn_slowpath_common+0x9c/0xb6
        [<ffffffff814deba2>] ? debug_print_object+0x7c/0x8d
        [<ffffffff81076116>] warn_slowpath_fmt+0x46/0x48
        [<ffffffff814deba2>] debug_print_object+0x7c/0x8d
        [<ffffffff81666bf1>] ? vxlan_fdb_destroy+0x5b/0x5b
        [<ffffffff814dee02>] __debug_check_no_obj_freed+0xc3/0x15f
        [<ffffffff814df728>] debug_check_no_obj_freed+0x12/0x16
        [<ffffffff8117ae4e>] slab_free_hook+0x64/0x6c
        [<ffffffff8114deaa>] ? kvfree+0x31/0x33
        [<ffffffff8117dc66>] kfree+0x101/0x1ac
        [<ffffffff8114deaa>] kvfree+0x31/0x33
        [<ffffffff817d4137>] netdev_freemem+0x18/0x1a
        [<ffffffff817e8b52>] netdev_release+0x2e/0x32
        [<ffffffff815b4163>] device_release+0x5a/0x92
        [<ffffffff814bd4dd>] kobject_cleanup+0x49/0x5e
        [<ffffffff814bd3ff>] kobject_put+0x45/0x49
        [<ffffffff817d3fc1>] netdev_run_todo+0x26f/0x283
        [<ffffffff817d4873>] ? rollback_registered_many+0x20f/0x23b
        [<ffffffff817e0c80>] rtnl_unlock+0xe/0x10
        [<ffffffff817d4af0>] default_device_exit_batch+0x12a/0x139
        [<ffffffff810aadfa>] ? wait_woken+0x8f/0x8f
        [<ffffffff817c8e14>] ops_exit_list+0x2b/0x57
        [<ffffffff817c9b21>] cleanup_net+0x154/0x1e7
        [<ffffffff8108b05d>] process_one_work+0x255/0x4ad
        [<ffffffff8108af69>] ? process_one_work+0x161/0x4ad
        [<ffffffff8108b4b1>] worker_thread+0x1cd/0x2ab
        [<ffffffff8108b2e4>] ? process_scheduled_works+0x2f/0x2f
        [<ffffffff81090686>] kthread+0xd4/0xdc
        [<ffffffff8109eca3>] ? local_clock+0x19/0x22
        [<ffffffff810905b2>] ? __kthread_parkme+0x83/0x83
        [<ffffffff81a31c48>] ret_from_fork+0x58/0x90
        [<ffffffff810905b2>] ? __kthread_parkme+0x83/0x83
      
      For the long-term, we should handle NETDEV_{UP,DOWN} event
      from the lower device of a tunnel device.
      
      Fixes: 56ef9c90 ("vxlan: Move socket initialization to within rtnl scope")
      Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: NCong Wang <xiyou.wangcong@gmail.com>
      Acked-by: NMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f13b1689
    • E
      tcp: do not rearm rsk_timer on FastOpen requests · dd929c1b
      Eric Dumazet 提交于
      FastOpen requests are not like other regular request sockets.
      
      They do not yet use rsk_timer : tcp_fastopen_queue_check()
      simply manually removes one expired request from fastopenq->rskq_rst
      list.
      
      Therefore, tcp_check_req() must not call mod_timer_pending(),
      otherwise we crash because rsk_timer was not initialized.
      
      Fixes: fa76ce73 ("inet: get rid of central tcp/dccp listener timer")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NYuchung Cheng <ycheng@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dd929c1b
    • D
      Merge tag 'nfc-next-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · 82740b9a
      David S. Miller 提交于
      Samuel Ortiz says:
      
      ====================
      NFC: 4.1 pull request
      
      This is the NFC pull request for 4.1.
      
      This is a shorter one than usual, as the Intel Field Peak NFC
      driver could not make it in time.
      
      We have:
      
      - A new driver for NXP NCI based chipsets, like e.g. the NPC100 or
        the PN7150. It currently only supports an i2c physical layer, but
        could easily be extended to work on top of e.g. SPI.
        This driver also includes support for user space triggered firmware
        updates.
      
      - A few minor st21nfc[ab] fixes, cleanups, and comments improvements.
      
      - A pn533 error return fix.
      
      - A few NFC related logs formatting cleanups.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      82740b9a
    • D
      sfc: Revert SRIOV changes. · 51df60f5
      David S. Miller 提交于
      This reverts commits:
      
      d92916f7 ("sfc: Own header for nic-specific sriov functions,")
      25672dba ("sfc: Enable VF's via a write to the sysfs file
       sriov_numvfs")
      
      As they break the build with SRIOV disabled and there is no
      easy way to fix it the way things are arranged.
      Reported-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51df60f5
    • D
      netfilter: Fix switch statement warnings with recent gcc. · c1f86676
      David Miller 提交于
      More recent GCC warns about two kinds of switch statement uses:
      
      1) Switching on an enumeration, but not having an explicit case
         statement for all members of the enumeration.  To show the
         compiler this is intentional, we simply add a default case
         with nothing more than a break statement.
      
      2) Switching on a boolean value.  I think this warning is dumb
         but nevertheless you get it wholesale with -Wswitch.
      
      This patch cures all such warnings in netfilter.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Acked-by: NPablo Neira Ayuso <pablo@netfilter.org>
      c1f86676
    • D
      Merge branch 'selinux-nlmsg' · e85e85c8
      David S. Miller 提交于
      Nicolas Dichtel says:
      
      ====================
      selinux: add some missing nlmsg commands
      
      It's not a critical issue, thus the patches are based on net-next.
      
      Patches are splitted because the 'Fixes' tag is not the same for all
      commands.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e85e85c8
    • N
      selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO · 5b5800fa
      Nicolas Dichtel 提交于
      These commands are missing.
      
      Fixes: 28d8909b ("[XFRM]: Export SAD info.")
      Signed-off-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5b5800fa
    • N
      selinux/nlmsg: add XFRM_MSG_GETSPDINFO · 5e6deeba
      Nicolas Dichtel 提交于
      This command is missing.
      
      Fixes: ecfd6b18 ("[XFRM]: Export SPD info")
      Signed-off-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5e6deeba