summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-10-146-3/+35
|\
| * mac80211: fix crash if bitrate calculation goes wrongJohannes Berg2013-10-141-0/+4
| * wireless: radiotap: fix parsing buffer overrunJohannes Berg2013-10-141-1/+6
| * cfg80211: don't add p2p device while in RFKILLEmmanuel Grumbach2013-10-092-2/+3
| * mac80211: correctly close cancelled scansEmmanuel Grumbach2013-10-092-0/+22
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-10-104-2/+8
|\ \ | |/
| * mac80211: Run deferred scan if last roc_list item is not startedJouni Malinen2013-09-301-0/+2
| * mac80211: update sta->last_rx on acked tx framesFelix Fietkau2013-09-301-0/+3
| * mac80211: use sta_info_get_bss() for nl80211 tx and client probingFelix Fietkau2013-09-302-2/+3
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-09-305-14/+22
|\ \ | |/
| * cfg80211: fix sysfs registration raceJohannes Berg2013-09-261-8/+13
| * mac80211: fix the setting of extended supported rate IEChun-Yeow Yeoh2013-09-261-4/+1
| * mac80211: drop spoofed packets in ad-hoc modeFelix Fietkau2013-09-261-0/+3
| * cfg80211: fix warning when using WEXT for IBSSBruno Randolf2013-09-261-0/+3
| * cfg80211: use the correct macro to check for active monitor supportLuciano Coelho2013-09-261-2/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-09-264-40/+34
|\ \
| * | Bluetooth: don't release the port in rfcomm_dev_state_change()Gianluca Anzolin2013-09-201-33/+2
| * | Bluetooth: Fix rfkill functionality during the HCI setup stageJohan Hedberg2013-09-181-3/+12
| * | Bluetooth: Introduce a new HCI_RFKILLED flagJohan Hedberg2013-09-181-5/+10
| * | Bluetooth: Fix ACL alive for long in case of non pariable devicesSyam Sidhardhan2013-09-161-0/+7
| * | Bluetooth: Fix encryption key size for peripheral roleAndre Guedes2013-09-161-0/+2
| * | Bluetooth: Fix security level for peripheral roleAndre Guedes2013-09-161-1/+3
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-09-1927-97/+102
|\ \ \
| * | | netpoll: fix NULL pointer dereference in netpoll_cleanupNikolay Aleksandrov2013-09-191-5/+4
| * | | ip: generate unique IP identificator if local fragmentation is allowedAnsis Atteka2013-09-197-11/+11
| * | | ip: use ip_hdr() in __ip_make_skb() to retrieve IP headerAnsis Atteka2013-09-191-1/+1
| * | | net:dccp: do not report ICMP redirects to user spaceDuan Jiong2013-09-181-0/+1
| * | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2013-09-181-0/+2
| |\ \ \
| | * | | batman-adv: set the TAG flag for the vid passed to BLAAntonio Quartulli2013-09-171-0/+2
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-09-179-28/+31
| |\ \ \ \
| | * | | | netfilter: nfnetlink_queue: use network skb for sequence adjustmentGao feng2013-09-171-1/+1
| | * | | | netfilter: ipset: Fix serious failure in CIDR trackingOliver Smith2013-09-161-12/+16
| | * | | | netfilter: ipset: Validate the set family and not the set type family at swap...Jozsef Kadlecsik2013-09-161-1/+1
| | * | | | netfilter: ipset: Consistent userspace testing with nomatch flagJozsef Kadlecsik2013-09-165-10/+9
| | * | | | netfilter: ipset: Skip really non-first fragments for IPv6 when getting port/...Jozsef Kadlecsik2013-09-161-2/+2
| | * | | | netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pktPhil Oester2013-09-131-2/+2
| * | | | | tcp: fix RTO calculated from cached RTTNeal Cardwell2013-09-171-1/+3
| | |/ / / | |/| | |
| * | | | net: sctp: rfc4443: do not report ICMP redirects to user spaceDaniel Borkmann2013-09-162-3/+2
| * | | | ip6_tunnels: raddr and laddr are inverted in nl msgDing Zhi2013-09-161-2/+2
| * | | | bridge: fix NULL pointer deref of br_port_get_rcuHong Zhiguo2013-09-151-4/+1
| * | | | bridge: use br_port_get_rtnl within rtnl lockHong Zhiguo2013-09-152-3/+3
| * | | | bridge: Clamp forward_delay when enabling STPHerbert Xu2013-09-123-8/+26
| * | | | resubmit bridge: fix message_age_timer calculationChris Healy2013-09-121-1/+1
| * | | | net: sctp: fix ipv6 ipsec encryption bug in sctp_v6_xmitDaniel Borkmann2013-09-121-29/+13
| * | | | netpoll: Should handle ETH_P_ARP other than ETH_P_IP in netpoll_neigh_replySonic Zhang2013-09-121-1/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2013-09-191-0/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | libceph: add function to ensure notifies are completeJosh Durgin2013-09-091-0/+11
* | | | | Merge git://git.kvack.org/~bcrl/aio-nextLinus Torvalds2013-09-131-12/+3
|\ \ \ \ \
| * | | | | aio: Kill ki_dtorKent Overstreet2013-07-301-11/+2
| * | | | | aio: Kill aio_rw_vect_retry()Kent Overstreet2013-07-301-1/+1
OpenPOWER on IntegriCloud