summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* net-timestamp: sock_tx_timestamp() fixEric Dumazet2014-08-061-2/+4
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-08-0641-629/+1129
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-08-051-0/+1
| |\
| | * ip_tunnel(ipv4): fix tunnels with "local any remote $remote_ip"Dmitry Popov2014-07-301-0/+1
| * | net-timestamp: add key to disambiguate concurrent datagramsWillem de Bruijn2014-08-051-0/+2
| * | net-timestamp: move timestamp flags out of sk_flagsWillem de Bruijn2014-08-051-18/+11
| * | net-timestamp: extend SCM_TIMESTAMPING ancillary data structWillem de Bruijn2014-08-051-1/+3
| * | tcp: reduce spurious retransmits due to transient SACK renegingNeal Cardwell2014-08-051-1/+1
| * | Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-08-056-53/+24
| |\ \
| | * | Bluetooth: Rename pairable mgmt setting to bondableJohan Hedberg2014-07-301-2/+2
| | * | Bluetooth: Rename HCI_PAIRABLE to HCI_BONDABLEJohan Hedberg2014-07-301-1/+1
| | * | 6lowpan: remove unused functionVarka Bhadram2014-07-301-11/+0
| | * | 6lowpan: remove unused macrosVarka Bhadram2014-07-301-15/+0
| | * | 6lowpan: remove unused LOWPAN_FRAG_SIZE defineAlexander Aring2014-07-301-11/+0
| | * | 6lowpan: iphc: use ipv6 api to check address scopeAlexander Aring2014-07-301-13/+0
| | * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-292-0/+7
| | |\ \
| | | * | Bluetooth: Provide defaults for LE advertising intervalGeorg Lukas2014-07-261-0/+2
| | | * | Bluetooth: Fix issue with ADV_IND reports and auto-connection handlingMarcel Holtmann2014-07-241-0/+1
| | | * | Bluetooth: Get MWS transport configuration of the controllerMarcel Holtmann2014-07-231-0/+2
| | | * | Bluetooth: Read list of local codecs supported by the controllerMarcel Holtmann2014-07-231-0/+2
| | * | | Merge tag 'nfc-next-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-292-0/+14
| | |\ \ \
| | | * | | NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooksMark A. Greer2014-07-231-0/+12
| | | * | | NFC: digital: Remove extra blank lineMark A. Greer2014-07-231-1/+0
| | | * | | NFC: hci: Add stop_poll HCI operand.Christophe Ricard2014-07-231-0/+1
| | | * | | NFC: digital: Add digital framing calls when in target modeMark A. Greer2014-07-211-0/+2
| * | | | | inet: frags: use kmem_cache for inet_frag_queueNikolay Aleksandrov2014-08-021-1/+3
| * | | | | inet: frags: enum the flag definitions and add descriptionsNikolay Aleksandrov2014-08-021-11/+35
| * | | | | inet: frags: rename last_in to flagsNikolay Aleksandrov2014-08-021-1/+1
| * | | | | sctp: Fixup v4mapped behaviour to comply with Sock APIJason Gunthorpe2014-07-312-5/+5
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-07-311-6/+0
| |\ \ \ \ \
| | * | | | | netfilter: kill remnants of ulog targetsPaul Bolle2014-07-251-6/+0
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-07-301-10/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | ipv4: fail early when creating netdev named all or defaultWANG Cong2014-07-291-0/+6
| * | | | | | net: remove deprecated syststamp timestampWillem de Bruijn2014-07-291-8/+3
| * | | | | | Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-07-286-223/+236
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-223-10/+18
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bluetooth: Introduce a flag to track who really initiates authenticationJohan Hedberg2014-07-171-0/+1
| | | * | | | Bluetooth: Pass initiator/acceptor information to hci_conn_security()Johan Hedberg2014-07-172-2/+3
| | | * | | | Bluetooth: Track number of LE slave connectionsJohan Hedberg2014-07-161-0/+5
| | | * | | | Bluetooth: Add a role parameter to hci_conn_add()Johan Hedberg2014-07-161-1/+2
| | | * | | | Bluetooth: Use explicit role instead of a bool in function parametersJohan Hedberg2014-07-161-3/+3
| | | * | | | Bluetooth: Convert HCI_CONN_MASTER flag to a conn->role variableJohan Hedberg2014-07-161-1/+1
| | | * | | | Bluetooth: Add proper defines for HCI connection roleJohan Hedberg2014-07-161-3/+3
| | | | |_|/ | | | |/| |
| | * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-07-221-0/+34
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | mac80211: add support for Rx reordering offloadingMichal Kazior2014-07-211-0/+34
| | * | | | Bluetooth: Convert L2CAP ident spinlock into a mutexMarcel Holtmann2014-07-131-2/+1
| | * | | | Bluetooth: Enable LE encryption events only when supportedMarcel Holtmann2014-07-131-0/+1
| | * | | | Bluetooth: Move SCO timeout constants into net/bluetooth/sco.cMarcel Holtmann2014-07-111-4/+0
| | * | | | Bluetooth: Remove unused SCO_DEFAULT_FLUSH_TO constantMarcel Holtmann2014-07-111-1/+0
| | * | | | Bluetooth: Move struct sco_conn into net/bluetooth/sco.cMarcel Holtmann2014-07-111-13/+0