summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-1916-42/+65
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-193-10/+30
| |\
| | * netfilter: ipset: Fix the order of listing of setsJozsef Kadlecsik2011-04-191-8/+10
| | * netfilter: ipset: set match and SET target fixesJozsef Kadlecsik2011-04-131-2/+16
| | * netfilter: ipset: bitmap:ip,mac type requires "src" for MACJozsef Kadlecsik2011-04-131-0/+4
| * | ip: ip_options_compile() resilient to NULL skb routeEric Dumazet2011-04-141-3/+3
| * | Revert "tcp: disallow bind() to reuse addr/port"David S. Miller2011-04-132-4/+3
| * | sctp: fix oops while removed transport still using as retran pathWei Yongjun2011-04-121-0/+2
| * | sctp: fix oops when updating retransmit path with DEBUG onVlad Yasevich2011-04-121-0/+2
| * | net: Disable NETIF_F_TSO_ECN when TSO is disabledBen Hutchings2011-04-121-0/+4
| * | net: Disable all TSO features when SG is disabledBen Hutchings2011-04-121-3/+3
| * | ieee802154: Remove hacked CFLAGS in net/ieee802154/MakefileDavid S. Miller2011-04-121-2/+0
| * | irda: fix locking unbalance in irda_sendmsgDave Jones2011-04-121-2/+1
| * | net: Do not wrap sysctl igmp_max_memberships in IP_MULTICASTJoakim Tjernlund2011-04-121-3/+0
| * | inetpeer: reduce stack usageEric Dumazet2011-04-121-6/+7
| * | bridge: reset IPCB in br_parse_ip_optionsEric Dumazet2011-04-121-4/+2
| * | llc: Fix length check in llc_fixup_skb().David S. Miller2011-04-111-2/+1
| * | caif: performance bugfix - allow radio stack to prioritize packets.Sjur Brændeland2011-04-111-1/+5
| * | caif: Bugfix use for_each_safe when removing list nodes.Sjur Brændeland2011-04-111-2/+2
* | | net/9p: nwname should be an unsigned intHarsh Prateek Bora2011-04-152-6/+6
* | | 9p: Fix sparse errorAneesh Kumar K.V2011-04-153-6/+14
* | | 9p: revert tsyncfs related changesAneesh Kumar K.V2011-04-151-21/+0
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2011-04-141-3/+9
|\ \ \ | |/ / |/| |
| * | libceph: fix linger request requeueingSage Weil2011-04-061-3/+9
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-1121-118/+181
|\ \ \
| * | | ipv4: Fix "Set rt->rt_iif more sanely on output routes."OGAWA Hirofumi2011-04-072-2/+7
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-061-1/+1
| |\ \ \
| | * | | mac80211: Fix duplicate frames on cooked monitorHelmut Schaa2011-04-041-1/+1
| * | | | dsa/mv88e6131: add support for mv88e6085 switchPeter Korsgaard2011-04-062-4/+21
| * | | | ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)Neil Horman2011-04-062-1/+6
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-0514-110/+146
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | netfilter: xt_conntrack: fix inverted conntrack direction testFlorian Westphal2011-04-041-1/+1
| | * | | netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->routeFlorian Westphal2011-04-042-15/+28
| | * | | netfilter: af_info: add 'strict' parameter to limit lookup to .oifFlorian Westphal2011-04-044-8/+16
| | * | | netfilter: af_info: add network namespace parameter to route hookFlorian Westphal2011-04-044-9/+11
| | * | | IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()Hans Schillstrom2011-04-041-1/+1
| | * | | netfilter: h323: bug in parsing of ASN1 SEQOF fieldDavid Sterba2011-04-041-1/+1
| | * | | netfilter: ipset: references are protected by rwlock instead of mutexJozsef Kadlecsik2011-04-045-53/+71
| | * | | netfilter: ipset: list:set timeout variant fixesJozsef Kadlecsik2011-04-041-29/+24
* | | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2011-04-081-1/+1
|\ \ \ \ \
| * | | | | Revert "net/sunrpc: Use static const char arrays"Trond Myklebust2011-04-061-1/+1
* | | | | | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-07103-160/+160
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix common misspellingsLucas De Marchi2011-03-31103-160/+160
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-0512-30/+69
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | ipv6: Don't pass invalid dst_entry pointer to dst_release().Boris Ostrovsky2011-04-041-0/+1
| | |_|/ / | |/| | |
| * | | | tcp: len check is unnecessarily devastating, change to WARN_ONIlpo Järvinen2011-04-011-1/+2
| * | | | sctp: malloc enough room for asconf-ack chunkWei Yongjun2011-04-011-2/+2
| | |/ / | |/| |
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-019-27/+64
| |\ \ \
| | * | | mac80211: fix aggregation frame release during timeoutDaniel Halperin2011-03-281-1/+2
| | * | | cfg80211: fix BSS double-unlinking (continued)Juuso Oikarinen2011-03-281-7/+11