summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-05-131-0/+12
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-061-0/+12
| |\
| | * cfg80211: add cfg80211_sched_scan_stopped_rtnlEliad Peller2014-05-051-0/+12
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-04-303-14/+109
|\ \ \
| * | | cfg80211: Dynamic channel bandwidth changes in AP modeJouni Malinen2014-04-281-0/+8
| * | | cfg80211: Add attributes describing prohibited channel bandwidthRostislav Lisovy2014-04-251-0/+6
| * | | mac80211: add option to generate CCMP IVs only for mgmt framesMarek Kwaczynski2014-04-251-6/+10
| * | | cfg80211: allow drivers to iterate over matching combinationsMichal Kazior2014-04-251-0/+27
| * | | mac80211: Update conf_is_ht() to work properly with 5/10MHz channelsRostislav Lisovy2014-04-091-1/+3
| * | | cfg80211: update comment about WIPHY_FLAG_CUSTOM_REGULATORYKalle Valo2014-04-091-1/+1
| * | | mac80211: allow reservation of a running chanctxLuciano Coelho2014-04-091-0/+7
| * | | cfg80211/mac80211: move interface counting for combination check to mac80211Luciano Coelho2014-04-091-2/+0
| * | | cfg80211/mac80211: refactor cfg80211_chandef_dfs_required()Luciano Coelho2014-04-091-2/+5
| * | | cfg80211: refactor cfg80211_can_use_iftype_chan()Luciano Coelho2014-04-091-0/+22
| * | | cfg80211: Enable GO operation on additional channelsIlan Peer2014-04-092-1/+9
| * | | cfg80211: Add indoor only and GO concurrent channel attributesDavid Spinadel2014-04-091-0/+5
| * | | mac80211: add vif to flush callEmmanuel Grumbach2014-04-091-1/+3
| * | | cfg80211: allow userspace to take ownership of interfacesJohannes Berg2014-04-091-0/+3
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-04-302-3/+11
|\ \ \ \
| * | | | Bluetooth: Keep msec in DISCOV_LE_TIMEOUTLukasz Rymanowski2014-03-281-1/+1
| * | | | Bluetooth: Add new debugfs parameterLukasz Rymanowski2014-03-281-0/+1
| * | | | Bluetooth: Keep msec in DISCOV_INTERLEAVED_TIMEOUTLukasz Rymanowski2014-03-281-1/+1
| * | | | Bluetooth: Store also RSSI for pending advertising reportsJohan Hedberg2014-03-261-0/+1
| * | | | Bluetooth: Fix line splitting of mgmt_device_found parametersJohan Hedberg2014-03-261-2/+2
| * | | | Bluetooth: Merge ADV_IND/ADV_SCAN_IND and SCAN_RSP togetherJohan Hedberg2014-03-261-0/+4
| * | | | Bluetooth: Add directed advertising support through connect()Johan Hedberg2014-03-261-0/+1
| * | | | Bluetooth: Add scan_rsp parameter to mgmt_device_found()Johan Hedberg2014-03-261-2/+3
* | | | | ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iifCong Wang2014-04-162-9/+10
* | | | | ipv4: add a sock pointer to dst->output() path.Eric Dumazet2014-04-155-11/+24
* | | | | ipv4: add a sock pointer to ip_queue_xmit()Eric Dumazet2014-04-153-3/+3
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-04-141-0/+10
|\ \ \ \ \
| * | | | | netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4Patrick McHardy2014-04-141-0/+10
* | | | | | Revert "net: sctp: Fix a_rwnd/rwnd management to reflect real state of the re...Daniel Borkmann2014-04-141-1/+13
* | | | | | ipv6: Limit mtu to 65575 bytesEric Dumazet2014-04-141-0/+5
| |_|_|/ / |/| | | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-04-122-2/+2
|\ \ \ \ \
| * | | | | net: Fix use after free by removing length arg from sk_data_ready callbacks.David S. Miller2014-04-112-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/e...Linus Torvalds2014-04-112-5/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 9pnet: p9_client->conn field is unused. Remove it.Simon Derr2014-03-251-2/+0
| * | | | 9P: Get rid of REQ_STATUS_FLSHSimon Derr2014-03-251-2/+0
| * | | | 9P: Add cancelled() to the transport functions.Simon Derr2014-03-251-0/+3
| * | | | 9P: Add memory barriers to protect request fields over cb/rpc threads handoffDominique Martinet2014-03-251-1/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-04-081-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->lenAndrey Vagin2014-04-031-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-04-032-17/+2
|\ \ \ \ | |/ / / |/| | |
| * | | cgroup: clean up cgroup_subsys names and initializationTejun Heo2014-02-082-2/+2
| * | | cgroup: make CONFIG_CGROUP_NET_PRIO bool and drop unnecessary init_netclassid...Tejun Heo2014-02-081-15/+0
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-0249-289/+1478
|\ \ \
| * | | mac802154: make csma/cca parameters per-wpanPhoebe Buckheister2014-04-011-0/+17
| * | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-03-311-1/+2
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-311-1/+2
| | |\ \ \