summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-06-254-24/+16
|\
| * nl80211: move set_qos_map command into split stateJohannes Berg2014-06-241-6/+5
| * cfg80211: fix elapsed_jiffies calculationEliad Peller2014-06-231-1/+1
| * Revert "cfg80211: Use 5MHz bandwidth by default when checking usable channels"Johannes Berg2014-06-231-15/+7
| * mac80211: WEP extra head/tail room in ieee80211_send_authMax Stepanov2014-06-231-2/+3
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-06-176-65/+85
|\ \ | |/ |/|
| * Bluetooth: Allow change security level on ATT_CID in slave roleMarcin Kraglak2014-06-131-5/+0
| * Bluetooth: Fix locking of hdev when calling into SMP codeJohan Hedberg2014-06-131-1/+6
| * Bluetooth: Fix deadlock in l2cap_conn_del()Jukka Taimisto2014-06-131-1/+7
| * Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI stateJohan Hedberg2014-06-131-3/+1
| * Bluetooth: Refactor discovery stopping into its own functionJohan Hedberg2014-06-131-44/+49
| * Bluetooth: Fix indicating discovery state when canceling inquiryJohan Hedberg2014-06-131-0/+4
| * Bluetooth: Fix setting correct authentication information for SMP STKJohan Hedberg2014-06-131-2/+7
| * Bluetooth: Add clarifying comment for conn->auth_typeJohan Hedberg2014-06-131-1/+5
| * Bluetooth: Fix SSP acceptor just-works confirmation without MITMJohan Hedberg2014-06-131-2/+5
| * Bluetooth: Fix check for connection encryptionJohan Hedberg2014-06-131-1/+1
| * Bluetooth: Fix incorrectly overriding conn->src_typeJohan Hedberg2014-06-131-5/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-06-154-14/+61
|\ \
| * | net: sctp: fix permissions for rto_alpha and rto_beta knobsDaniel Borkmann2014-06-151-4/+28
| * | net: Fix save software checksum completeTom Herbert2014-06-152-10/+29
| * | udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookupEric Dumazet2014-06-131-0/+4
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-06-123-7/+153
|\ \ | |/ |/|
| * libceph: add ceph_monc_wait_osdmap()Ilya Dryomov2014-06-061-0/+27
| * libceph: mon_get_version request infrastructureIlya Dryomov2014-06-063-5/+122
| * libceph: recognize poolop requests in debugfsIlya Dryomov2014-06-061-2/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-06-12346-6799/+13776
|\ \
| * | rtnetlink: fix userspace API breakage for iproute2 < v3.9.0Michal Schmidt2014-06-121-4/+18
| * | tcp: fixing TLP's FIN recoveryPer Hurtig2014-06-121-3/+1
| * | bridge: fix compile error when compiling without IPv6 supportLinus Lüssing2014-06-121-0/+2
| * | bridge: fix smatch warning / potential null pointer dereferenceLinus Lüssing2014-06-121-0/+2
| * | sctp: Fix sk_ack_backlog wrap-around problemXufeng Zhang2014-06-121-1/+1
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-06-1110-16/+32
| |\ \
| | * | net/core: Add VF link state control policyDoug Ledford2014-06-111-0/+2
| | * | net: fix UDP tunnel GSO of frag_list GRO packetsWei-Chun Chao2014-06-111-1/+2
| | * | net: ipv6: Fixed up ipsec packet be re-routing issuehuizhang2014-06-111-0/+1
| | * | ip_tunnel: fix i_key matching in ip_tunnel_findDmitry Popov2014-06-111-2/+3
| | * | ip_vti: Fix 'ip tunnel add' with 'key' parametersDmitry Popov2014-06-112-5/+13
| | * | dns_resolver: assure that dns_query() result is null-terminatedManuel Schölling2014-06-111-1/+3
| | * | ipip, sit: fix ipv4_{update_pmtu,redirect} callsDmitry Popov2014-06-102-4/+4
| | * | net: force a list_del() in unregister_netdevice_many()Eric Dumazet2014-06-083-3/+4
| | * | ip_tunnel: fix possible rtable leakDmitry Popov2014-06-051-0/+1
| * | | net_sched: drr: warn when qdisc is not work conservingFlorian Westphal2014-06-112-2/+4
| * | | net: Add skb_gro_postpull_rcsum to udp and vxlanTom Herbert2014-06-111-0/+1
| * | | net: Save software checksum completeTom Herbert2014-06-113-8/+15
| * | | ceph: remove bogus externstephen hemminger2014-06-111-1/+1
| * | | ipv4: fix a race in ip4_datagram_release_cb()Eric Dumazet2014-06-111-5/+15
| * | | net: add __pskb_copy_fclone and pskb_copy_for_cloneOctavian Purdila2014-06-117-15/+19
| * | | bridge: Support 802.1ad vlan filteringToshiaki Makita2014-06-113-0/+130
| * | | bridge: Prepare for forwarding another bridge group addressesToshiaki Makita2014-06-113-2/+10
| * | | bridge: Prepare for 802.1ad vlan filtering supportToshiaki Makita2014-06-113-12/+51
OpenPOWER on IntegriCloud