summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-0126-119/+215
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-011-4/+0
| |\
| | * Revert "netfilter: ensure number of counters is >0 in do_replace()"Bernhard Thaler2015-06-011-4/+0
| * | vti6: Add pmtu handling to vti6_xmit.Steffen Klassert2015-06-011-0/+14
| * | Revert "net: core: 'ethtool' issue with querying phy settings"David S. Miller2015-06-011-9/+1
| * | net: dsa: Properly propagate errors from dsa_switch_setup_oneFlorian Fainelli2015-05-311-2/+2
| * | tcp: fix child sockets to use system default congestion control if not setNeal Cardwell2015-05-312-2/+8
| * | udp: fix behavior of wrong checksumsEric Dumazet2015-05-312-8/+4
| * | bridge: fix br_multicast_query_expired() bugEric Dumazet2015-05-301-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-05-287-11/+43
| |\ \
| | * | ip_vti/ip6_vti: Preserve skb->mark after rcv_cb callAlexander Duyck2015-05-282-4/+14
| | * | xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_inputAlexander Duyck2015-05-281-1/+16
| | * | ip_vti/ip6_vti: Do not touch skb->mark on xmitAlexander Duyck2015-05-282-3/+6
| | * | xfrm: Always zero high-order sequence number bitsHerbert Xu2015-05-211-0/+2
| | * | esp6: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| | * | esp4: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| | * | xfrm: fix a race in xfrm_state_lookup_byspiLi RongQing2015-04-291-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-05-2710-69/+122
| |\ \ \ | | | |/ | | |/|
| | * | net_sched: invoke ->attach() after setting dev->qdiscWANG Cong2015-05-271-4/+6
| | * | unix/caif: sk_socket can disappear when state is unlockedMark Salyzyn2015-05-262-0/+16
| | * | Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/lin...David S. Miller2015-05-267-65/+100
| | |\ \
| | | * | mac80211: fix AP_VLAN crypto tailroom calculationMichal Kazior2015-05-204-9/+83
| | | * | mac80211: don't split remain-on-channel for coalescingJohannes Berg2015-05-202-54/+11
| | | * | mac80211: don't use napi_gro_receive() outside NAPI contextJohannes Berg2015-05-192-2/+6
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2015-05-231-13/+20
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"Ilya Dryomov2015-05-201-2/+0
| | * | | libceph: request a new osdmap if lingering request maps to no osdIlya Dryomov2015-05-201-11/+20
* | | | | vlan: Add GRO support for non hardware accelerated vlanToshiaki Makita2015-06-011-0/+96
* | | | | openvswitch: include datapath actions with sampled-packet upcall to userspaceNeil McKee2015-06-013-10/+33
* | | | | 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
OpenPOWER on IntegriCloud