summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2009-10-231-1/+0
|\
| * virtio: let header files include virtio_ids.hChristian Borntraeger2009-10-221-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-10-238-29/+97
|\ \ | |/ |/|
| * tcp: Try to catch MSG_PEEK bugHerbert Xu2009-10-201-1/+3
| * net: Fix IP_MULTICAST_IFEric Dumazet2009-10-192-5/+8
| * bluetooth: static lock key fixDave Young2009-10-191-3/+6
| * bluetooth: scheduling while atomic bug fixDave Young2009-10-191-2/+2
| * tcp: fix TCP_DEFER_ACCEPT retrans calculationJulian Anastasov2009-10-191-12/+43
| * tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPTJulian Anastasov2009-10-191-3/+31
| * tcp: accept socket after TCP_DEFER_ACCEPT periodJulian Anastasov2009-10-191-2/+2
| * Revert "tcp: fix tcp_defer_accept to consider the timeout"David S. Miller2009-10-191-1/+0
| * AF_UNIX: Fix deadlock on connecting to shutdown socketTomoki Sekiyama2009-10-181-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-10-1510-40/+66
|\ \ | |/
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-10-132-2/+4
| |\
| | * mac80211: document ieee80211_rx() context requirementJohannes Berg2009-10-121-0/+2
| | * mac80211: fix ibss raceJohannes Berg2009-10-121-1/+1
| | * mac80211: fix logic error ibss merge bssid checkFelix Fietkau2009-10-121-1/+1
| * | udp: Fix udp_poll() and ioctl()Eric Dumazet2009-10-131-30/+43
| * | tcp: fix tcp_defer_accept to consider the timeoutWilly Tarreau2009-10-131-0/+1
| * | pkt_sched: pedit use proper structjamal2009-10-111-1/+1
| |/
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-10-085-6/+16
| |\
| | * cfg80211: fix netns error unwinding bugJohannes Berg2009-10-081-1/+2
| | * mac80211: use kfree_skb() to free struct sk_buff pointersRoel Kluin2009-10-071-2/+2
| | * mac80211: fix vlan and optimise RXJohannes Berg2009-10-073-3/+12
| * | netlink: fix typo in initializationJiri Pirko2009-10-081-1/+1
| |/
* | headers: remove sched.h from interrupt.hAlexey Dobriyan2009-10-119-0/+9
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-10-083-10/+14
|\ \ | |/
| * ipv4: arp_notify address list bugStephen Hemminger2009-10-071-6/+10
| * wext: let get_wireless_stats() sleepJohannes Berg2009-10-051-2/+2
| * pktgen: restore nanosec delaysEric Dumazet2009-10-041-1/+1
| * pktgen: Fix multiqueue handlingEric Dumazet2009-10-041-1/+1
* | headers: remove sched.h from poll.hAlexey Dobriyan2009-10-041-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-10-027-10/+19
|\ \ | |/
| * net: splice() from tcp to pipe should take into account O_NONBLOCKEric Dumazet2009-10-021-1/+1
| * net: Use sk_mark for routing lookup in more placesAtis Elsts2009-10-013-0/+3
| * IPv4 TCP fails to send window scale option when window scale is zeroOri Finkelman2009-10-011-5/+6
| * net/ipv4/tcp.c: fix min() type mismatch warningAndrew Morton2009-10-011-1/+1
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-10-011-1/+4
| |\
| | * mac80211: Fix [re]association power saving issue on AP sideIgor Perminov2009-09-291-1/+4
| * | pktgen: Fix delay handlingEric Dumazet2009-10-011-2/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-09-3048-119/+127
|\ \ \ | |/ /
| * | ax25: Fix possible oops in ax25_make_newJarek Poplawski2009-09-301-1/+1
| * | net: restore tx timestamping for accelerated vlansEric Dumazet2009-09-301-3/+3
| * | Phonet: fix mutex imbalanceRémi Denis-Courmont2009-09-301-1/+0
| * | sit: fix off-by-one in ipip6_tunnel_get_prlSascha Hlusiak2009-09-301-1/+1
| * | net: Fix sock_wfree() raceEric Dumazet2009-09-301-7/+12
| * | net: Make setsockopt() optlen be unsigned.David S. Miller2009-09-3045-106/+110
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-09-3013-106/+52
|\ \ | |/
| * Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2009-09-285-28/+26
| |\
| | * wext: add back wireless/ dir in sysfs for cfg80211 interfacesJohannes Berg2009-09-282-8/+6
OpenPOWER on IntegriCloud