summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* net: Add priority to packet_offload objects.David S. Miller2015-06-013-2/+9
* net/rds Add getsockopt support for SO_RDS_TRANSPORTSowmini Varadhan2015-05-311-0/+14
* net/rds: Add setsockopt support for SO_RDS_TRANSPORTSowmini Varadhan2015-05-314-0/+53
* net/rds: Declare SO_RDS_TRANSPORT and RDS_TRANS_* constants in uapi/linux/rds.hSowmini Varadhan2015-05-311-5/+0
* ebpf: allow bpf_ktime_get_ns_proto also for networkingDaniel Borkmann2015-05-311-0/+2
* Merge tag 'mac80211-next-for-davem-2015-05-29' of git://git.kernel.org/pub/sc...David S. Miller2015-05-3110-27/+73
|\
| * net: rfkill: gpio: make better use of gpiod APIUwe Kleine-König2015-05-291-14/+10
| * cfg80211: ignore netif running state when changing iftypeMichal Kazior2015-05-291-1/+1
| * mac80211: prevent possible crypto tx tailroom corruptionMichal Kazior2015-05-291-0/+3
| * cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnectJohannes Berg2015-05-263-2/+6
| * mac80211: disconnect TDLS stations on STA CSAArik Nemtsov2015-05-202-0/+32
| * mac80211: check fast-xmit on station changeMichal Kazior2015-05-201-0/+1
| * cfg80211: Switch to PM opsLars-Peter Clausen2015-05-201-6/+8
| * net: rfkill: Switch to PM opsLars-Peter Clausen2015-05-201-3/+9
| * mac80211: fix memory leakJohannes Berg2015-05-201-1/+3
* | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2015-05-3143-137/+165
|\ \
| * | batman-adv: Use common declaration order in *_send_skb_(packet|unicast)Antonio Quartulli2015-05-291-1/+1
| * | batman-adv: iv_ogm_orig_update, remove unnecessary bracketsMarkus Pargmann2015-05-291-1/+1
| * | batman-adv: iv_ogm_can_aggregate, code readabilityMarkus Pargmann2015-05-291-49/+53
| * | batman-adv: checkpatch - spaces preferred around that '*'Marek Lindner2015-05-292-2/+2
| * | batman-adv: checkpatch - comparison to NULL could be rewrittenMarek Lindner2015-05-291-1/+1
| * | batman-adv: Use safer default config for optional featuresSven Eckelmann2015-05-292-2/+2
| * | batman-adv: iv_ogm_send_to_if, declare char* as constMarkus Pargmann2015-05-291-1/+1
| * | batman-adv: iv_ogm_aggr_packet, bool return valueMarkus Pargmann2015-05-291-2/+2
| * | batman-adv: iv_ogm_iface_enable, direct return valuesMarkus Pargmann2015-05-291-6/+2
| * | batman-adv: Makefile, Sort alphabeticallyMarkus Pargmann2015-05-291-1/+1
| * | batman-adv: tvlv realloc, move error handling into if blockMarkus Pargmann2015-05-291-8/+8
| * | batman-adv: debugfs, avoid compiling for !DEBUG_FSMarkus Pargmann2015-05-293-9/+35
| * | batman-adv: Use only queued fragments when mergingSven Eckelmann2015-05-291-8/+5
| * | batman-adv: Check total_size when queueing fragmentsSven Eckelmann2015-05-292-2/+7
| * | batman-adv: update copyright years for 2015Sven Eckelmann2015-05-2943-43/+43
| * | batman-adv: Start new development cycleSimon Wunderlich2015-05-291-1/+1
* | | netevent: remove automatic variable in register_netevent_notifier()Wang Long2015-05-311-4/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-05-316-11/+233
|\ \ \
| * | | netfilter: nf_tables: add netdev table to filter from ingressPablo Neira Ayuso2015-05-263-0/+189
| * | | netfilter: nf_tables: allow to bind table to net_devicePablo Neira Ayuso2015-05-261-5/+41
| * | | netfilter: default CONFIG_NETFILTER_INGRESS to yPablo Neira Ayuso2015-05-261-0/+1
| * | | netfilter: remove unused comefrom hookmask argumentFlorian Westphal2015-05-262-6/+2
* | | | ipv6: drop unneeded gotoJulia Lawall2015-05-301-7/+1
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-05-3022-281/+476
|\ \ \ \
| * | | | nl802154: add support to set cca ed levelAlexander Aring2015-05-274-0/+75
| * | | | nl802154: add support for cca ed level infoAlexander Aring2015-05-271-0/+7
| * | | | ieee802154: fix typo for file nameVarka Bhadram2015-05-271-1/+1
| * | | | ieee802154: add set transmit power supportVarka Bhadram2015-05-274-0/+76
| * | | | nl802154: fix cca mode wpan phy flagAlexander Aring2015-05-261-1/+1
| * | | | mac802154: mac802154_mlme_start_req() optimisation.Lennert Buytenhek2015-05-261-18/+11
| * | | | ieee802154 socket: No need to check for ARPHRD_IEEE802154 in raw_bind().Lennert Buytenhek2015-05-261-6/+0
| * | | | ieee802154: Remove 802.15.4/6LoWPAN checks for interface MTU.Lennert Buytenhek2015-05-261-14/+3
| * | | | ieee802154 socket: Return EMSGSIZE from raw_sendmsg() if packet too big.Lennert Buytenhek2015-05-261-1/+1
| * | | | mac802154: Avoid rtnl deadlock in mac802154_wpan_ioctl().Lennert Buytenhek2015-05-261-0/+3