summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-10-316-36/+104
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-10-316-36/+104
| |\
| | * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-10-296-36/+104
| | |\
| | | * mac80211: make sure data is accessible in EAPOL checkJohannes Berg2012-10-261-8/+10
| | | * mac80211: verify that skb data is presentJohannes Berg2012-10-262-2/+33
| | | * mac80211: check management frame header lengthJohannes Berg2012-10-261-4/+8
| | | * wireless: drop invalid mesh address extension framesJohannes Berg2012-10-261-5/+6
| | | * mac80211: fix SSID copy on IBSS JOINAntonio Quartulli2012-10-261-1/+1
| | | * mac80211: don't inspect Sequence Control field on control framesJavier Cardona2012-10-251-0/+4
| | | * mac80211: Don't drop frames received with mesh ttl == 1Javier Cardona2012-10-251-1/+1
| | | * mac80211: Only process mesh config header on frames that RA_MATCHJavier Cardona2012-10-251-4/+2
| | | * mac80211: use blacklist for duplicate IE checkJohannes Berg2012-10-241-7/+35
| | | * cfg80211: fix initialization of chan->max_reg_powerFelix Fietkau2012-10-181-2/+3
| | | * cfg80211: fix antenna gain handlingFelix Fietkau2012-10-181-2/+1
* | | | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-10-314-5/+10
|\ \ \ \ | |/ / / |/| | |
| * | | netfilter: nf_defrag_ipv6: solve section mismatch in nf_conntrack_reasmHein Tibosch2012-10-281-2/+2
| * | | netfilter: nf_nat: don't check for port change on ICMP tuplesUlrich Weber2012-10-282-2/+6
| * | | netfilter: nf_conntrack: fix rt_gateway checks for H.323 helperJulian Anastasov2012-10-221-1/+2
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-2624-72/+135
|\ \ \ \
| * | | | ipv6: Set default hoplimit as zero.Li RongQing2012-10-241-2/+2
| * | | | tcp: Reject invalid ack_seq to Fast Open socketsJerry Chu2012-10-232-4/+12
| * | | | net: fix secpath kmemleakEric Dumazet2012-10-221-2/+4
| * | | | tcp: add SYN/data info to TCP_INFOYuchung Cheng2012-10-224-0/+5
| |/ / /
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-10-197-32/+45
| |\ \ \ | | |/ /
| | * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-10-173-24/+34
| | |\ \ | | | |/
| | | * mac80211: connect with HT20 if HT40 is not permittedJohannes Berg2012-10-171-10/+20
| | | * cfg80211/mac80211: avoid state mishmash on deauthStanislaw Gruszka2012-10-152-11/+6
| | | * Merge remote-tracking branch 'wireless/master' into mac80211Johannes Berg2012-10-15460-9632/+17843
| | | |\
| | | * | mac80211: Fix FC masking in BIP AAD generationJouni Malinen2012-10-011-3/+8
| | * | | mac80211: use ieee80211_free_txskb in a few more placesFelix Fietkau2012-10-153-5/+5
| | * | | mac80211: check if key has TKIP type before updating IVStanislaw Gruszka2012-10-151-1/+2
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-10-151-2/+4
| | |\ \ \
| | | * | | Bluetooth: SMP: Fix setting unknown auth_req bitsJohan Hedberg2012-10-121-2/+4
| * | | | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-10-183-10/+27
| |\ \ \ \ \
| | * | | | | batman-adv: Fix potential broadcast BLA-duplicate-check race conditionLinus Lüssing2012-10-182-5/+16
| | * | | | | batman-adv: Fix broadcast packet CRC calculationLinus Lüssing2012-10-182-5/+11
| * | | | | | tcp: fix FIONREAD/SIOCINQEric Dumazet2012-10-181-5/+3
| * | | | | | netlink: use kfree_rcu() in netlink_release()Eric Dumazet2012-10-181-4/+15
| * | | | | | ipv4: Fix flushing of cached routing informationsSteffen Klassert2012-10-181-3/+6
| * | | | | | vlan: allow to change type when no vlan device is hooked on netdevJiri Pirko2012-10-181-1/+3
| * | | | | | netfilter: xt_TEE: don't use destination address found in headerEric Dumazet2012-10-171-0/+1
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netPablo Neira Ayuso2012-10-1763-796/+816
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | netfilter: xt_nat: fix incorrect hooks for SNAT and DNAT targetsElison Niven2012-10-151-4/+4
| * | | | | | netfilter: xt_CT: fix timeout setting with IPv6Pablo Neira Ayuso2012-10-151-4/+6
| * | | | | | ipvs: initialize returned data in do_ip_vs_get_ctlArnd Bergmann2012-10-091-1/+2
* | | | | | | SUNRPC: Get rid of the xs_error_report socket callbackTrond Myklebust2012-10-241-25/+0
* | | | | | | SUNRPC: Prevent races in xs_abort_connection()Trond Myklebust2012-10-241-5/+8
* | | | | | | Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."Trond Myklebust2012-10-241-1/+1
* | | | | | | SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAITTrond Myklebust2012-10-241-0/+1
* | | | | | | Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-191-0/+2
|\ \ \ \ \ \ \
OpenPOWER on IntegriCloud