summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-189-9/+91
|\
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-06-135-4/+12
| |\
| | * mac80211: stop polling in disassociationDavid Spinadel2012-06-131-2/+2
| | * mac80211: check sdata_running on ieee80211_set_bitrate_maskEliad Peller2012-06-131-0/+3
| | * cfg80211: fix potential deadlock in regulatoryEliad Peller2012-06-131-1/+1
| | * mac80211: add missing kernel-docAshok Nagarajan2012-06-121-0/+3
| | * cfg80211: check iface combinations only when iface is runningMichal Kazior2012-06-091-1/+1
| | * mac80211: add some missing kernel-docJohannes Berg2012-06-091-0/+2
| * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-114-5/+79
| |\ \ | | |/ | |/|
| | * Bluetooth: Add support for encryption key refreshJohan Hedberg2012-06-081-0/+48
| | * Bluetooth: Fix SMP security elevation from medium to highJohan Hedberg2012-06-081-3/+6
| | * Bluetooth: Fix deadlock and crash when SMP pairing times outJohan Hedberg2012-06-081-1/+6
| | * Bluetooth: Fix LE pairing completion on connection failureVishal Agarwal2012-06-081-0/+18
| | * Bluetooth: Fix SMP pairing method selectionJohan Hedberg2012-06-081-1/+1
* | | net: remove my future former mail addressRémi Denis-Courmont2012-06-179-15/+14
* | | Revert "ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ip...David S. Miller2012-06-162-22/+12
* | | ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ipv6_routeThomas Graf2012-06-152-12/+22
* | | net: remove skb_orphan_try()Eric Dumazet2012-06-153-26/+1
* | | netpoll: fix netpoll_send_udp() bugsEric Dumazet2012-06-131-5/+6
* | | Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-06-122-34/+43
|\ \ \
| * | | netfilter: nf_ct_h323: fix bug in rtcp nattingPablo Neira Ayuso2012-06-071-3/+2
| * | | netfilter: xt_HMARK: fix endianness and provide consistent hashingHans Schillstrom2012-06-071-31/+41
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-112-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | mac80211: add back channel change flagStanislaw Gruszka2012-06-081-1/+1
| * | | NFC: Fix possible NULL ptr deref when getting the name of a socketSasha Levin2012-06-081-0/+3
* | | | net/core: fix kernel-doc warningsRandy Dunlap2012-06-082-3/+3
* | | | l2tp: fix a race in l2tp_ip_sendmsg()Eric Dumazet2012-06-081-3/+6
* | | | snmp: fix OutOctets counter to include forwarded datagramsVincent Bernat2012-06-074-0/+5
* | | | appletalk: Remove out of date message in printkDave Jones2012-06-071-3/+1
* | | | ipv6: fib: Restore NTF_ROUTER exception in fib6_age()Thomas Graf2012-06-071-1/+1
* | | | net: neighbour: fix neigh_dump_info()Eric Dumazet2012-06-071-8/+6
* | | | net: l2tp_eth: fix kernel panic on rmmod l2tp_ethEric Dumazet2012-06-071-0/+2
| |/ / |/| |
* | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-06-0611-22/+97
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-0611-22/+97
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-06-061-1/+1
| | |\ \ | | | |/
| | | * Bluetooth: Fix checking the wrong flag when accepting a socketVinicius Costa Gomes2012-06-051-1/+1
| | * | cfg80211: fix interface combinations checkJohannes Berg2012-06-051-1/+18
| | |/
| | * mac80211: fix non RCU-safe sta_list manipulationArik Nemtsov2012-06-041-2/+2
| | * mac80211: Fix likely misuse of | for &Joe Perches2012-06-041-3/+3
| | * mac80211: add missing rcu_read_lock/unlock in agg-rx session timerFelix Fietkau2012-06-041-1/+6
| | * mac80211: clean up remain-on-channel on interface stopJohannes Berg2012-06-042-0/+28
| | * mac80211: fix error in station state transitions during reconfigMeenakshi Venkataraman2012-06-041-1/+1
| | * mac80211: Fix Unreachable Mesh Station Problem when joining to another MBSSChun-Yeow Yeoh2012-06-041-3/+6
| | * cfg80211: use sme_state in ibss start/join pathAmitkumar Karwar2012-06-041-1/+5
| | * mac80211: run scan after finish connection monitoringStanislaw Gruszka2012-06-041-9/+27
* | | inetpeer: fix a race in inetpeer_gc_worker()Eric Dumazet2012-06-061-4/+12
|/ /
* | drop_monitor: dont sleep in atomic contextEric Dumazet2012-06-041-69/+33
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-06-024-9/+19
|\
| * tcp: reflect SYN queue_mapping into SYNACK packetsEric Dumazet2012-06-012-6/+12
| * tcp: do not create inetpeer on SYNACK messageEric Dumazet2012-06-011-1/+2
OpenPOWER on IntegriCloud