summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-04-0717-316/+546
|\
| * Bluetooth: Fix location of TX power field in LE advertising dataMarcel Holtmann2015-04-041-6/+8
| * Bluetooth: hidp: Use BIT(x) instead of (1 << x)Marcel Holtmann2015-04-041-2/+2
| * Bluetooth: cmtp: Use BIT(x) instead of (1 << x)Marcel Holtmann2015-04-042-3/+3
| * Bluetooth: bnep: Handle BNEP connection setup requestGrzegorz Kolodziejczyk2015-04-033-4/+15
| * Bluetooth: bnep: Add support to extended headers of control framesGrzegorz Kolodziejczyk2015-04-031-10/+36
| * Bluetooth: bnep: Add support for get bnep features via ioctlGrzegorz Kolodziejczyk2015-04-032-0/+8
| * Bluetooth: bnep: Return err value while sending cmd is not understoodGrzegorz Kolodziejczyk2015-04-031-1/+1
| * Bluetooth: Disallow LE local out-of-band data when LE privacy is usedMarcel Holtmann2015-04-021-6/+19
| * Bluetooth: Convert local OOB data reading to use HCI requestJohan Hedberg2015-04-022-51/+65
| * Bluetooth: Move hci_get_cmd_complete() to hci_event.cJohan Hedberg2015-04-022-51/+58
| * Bluetooth: Remove unused hci_req_pending() functionJohan Hedberg2015-04-021-5/+0Star
| * Bluetooth: Remove unneeded recv_event variableJohan Hedberg2015-04-022-15/+0Star
| * Bluetooth: Convert hci_req_sync family of function to new request APIJohan Hedberg2015-04-021-14/+14
| * Bluetooth: Add second hci_request callback option for full skbJohan Hedberg2015-04-024-44/+81
| * Bluetooth: Add clarifying comment to command status handlingJohan Hedberg2015-04-021-0/+6
| * Bluetooth: Export SMP selftest result in debugfsMarcel Holtmann2015-04-021-9/+34
| * Bluetooth: Export ECDH selftest result in debugfsMarcel Holtmann2015-04-021-4/+31
| * Bluetooth: Restrict BNEP flags to only valid onesMarcel Holtmann2015-04-021-1/+11
| * Bluetooth: Restrict HIDP flags to only valid onesMarcel Holtmann2015-04-021-1/+10
| * Bluetooth: Restrict CMTP flags to only valid onesMarcel Holtmann2015-04-021-1/+10
| * Bluetooth: Expose current Device ID information via debugfsMarcel Holtmann2015-04-021-0/+26
| * Bluetooth: Refactor HCI request variables into own structJohan Hedberg2015-03-304-12/+12
| * Bluetooth: Refactor L2CAP variables into l2cap_ctrlJohan Hedberg2015-03-303-28/+28
| * Bluetooth: Remove superfluous extra empty line between functionsMarcel Holtmann2015-03-291-1/+0Star
| * Bluetooth: Fix error returns for Read Local OOB Extended Data commandsMarcel Holtmann2015-03-291-37/+34Star
| * Bluetooth: Move memory location outside of hci_dev lockMarcel Holtmann2015-03-291-8/+6Star
| * Bluetooth: Update adv. parameters when conn. setting changesArman Uguray2015-03-281-1/+2
| * Bluetooth: Use ADV_SCAN_IND for adv. instancesArman Uguray2015-03-281-1/+20
| * Bluetooth: Fix using global connectable settings for advArman Uguray2015-03-281-4/+10
| * Bluetooth: Fix race condition with HCI_RESET flagJohan Hedberg2015-03-281-10/+10
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-0713-42/+60
|\ \
| * | net: dsa: fix filling routing table from OF descriptionPavel Nakonechny2015-04-061-16/+7Star
| * | l2tp: unregister l2tp_net_ops on failure pathWANG Cong2015-04-061-0/+1
| * | ipv6: protect skb->sk accesses from recursive dereference inside the stackhannes@stressinduktion.org2015-04-063-2/+24
| * | netns: don't allocate an id for dead netnsNicolas Dichtel2015-04-031-1/+3
| * | Revert "netns: don't clear nsid too early on removal"Nicolas Dichtel2015-04-031-15/+9Star
| * | ip6mr: call del_timer_sync() in ip6mr_free_table()WANG Cong2015-04-031-1/+1
| * | net: move fib_rules_unregister() under rtnl lockWANG Cong2015-04-036-5/+8
| * | ipv4: take rtnl_lock and mark mrt table as freed on namespace cleanupWANG Cong2015-04-031-0/+5
| * | tcp: fix FRTO undo on cumulative ACK of SACKed rangeNeal Cardwell2015-04-021-3/+4
* | | tc: bpf: add checksum helpersAlexei Starovoitov2015-04-061-4/+104
* | | netfilter: Pass nf_hook_state through arpt_do_table().David S. Miller2015-04-042-7/+6Star
* | | netfilter: Pass nf_hook_state through nft_set_pktinfo*().David S. Miller2015-04-048-20/+18Star
* | | netfilter: Pass nf_hook_state through ip6t_do_table().David S. Miller2015-04-046-20/+16Star
* | | netfilter: Pass nf_hook_state through nf_nat_ipv6_{in,out,fn,local_fn}().David S. Miller2015-04-043-36/+27Star
* | | netfilter: Pass nf_hook_state through ipt_do_table().David S. Miller2015-04-046-19/+16Star
* | | netfilter: Pass nf_hook_state through nf_nat_ipv4_{in,out,fn,local_fn}().David S. Miller2015-04-043-37/+28Star
* | | netfilter: Make nf_hookfn use nf_hook_state.David S. Miller2015-04-0432-266/+157Star
* | | netfilter: Use nf_hook_state in nf_queue_entry.David S. Miller2015-04-044-44/+38Star