aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-17
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-17
| |\
| | * mac80211: don't process work item with wrong frameJohannes Berg2010-05-12
| * | mac80211: fix paged defragmentationAbhijeet Kolekar2010-05-12
| * | mac80211: check channel switch mode for future frames transmitWey-Yi Guy2010-05-12
| * | mac80211: add offload channel switch supportJohannes Berg2010-05-12
| * | Merge branch 'wireless-2.6' into wireless-next-2.6Reinette Chatre2010-05-10
| |\|
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-12
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-11
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-05-11
| | |\ \ \ | | | | |/ | | | |/|
| | | * | mac80211: remove association work when processing deauth requestReinette Chatre2010-05-07
| | * | | net: Fix FDDI and TR config checks in ipv4 arp and LLC.David S. Miller2010-05-10
| | * | | IPv4: unresolved multicast route cleanupAndreas Meissner2010-05-10
| | * | | ipv4: udp: fix short packet and bad checksum loggingBjørn Mork2010-05-07
| | * | | sctp: Fix a race between ICMP protocol unreachable and connect()Vlad Yasevich2010-05-06
| | * | | veth: Dont kfree_skb() after dev_forward_skb()Eric Dumazet2010-05-06
| | * | | IPv6: fix IPV6_RECVERR handling of locally-generated errorsBrian Haley2010-05-06
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-05
| |\| | |
| | * | | ipv6: Fix default multicast hops setting.David S. Miller2010-05-04
| * | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-04-29
| |\ \ \ \
| | * | | | SUNRPC: Fix a bug in rpcauth_prune_expiredTrond Myklebust2010-04-22
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beaconsJohn W. Linville2010-05-07
| * | | | | mac80211: improve HT channel handlingJohannes Berg2010-05-07
| * | | | | cfg80211/mac80211: better channel handlingJohannes Berg2010-05-07
| * | | | | mac80211: fix BSS info reconfigurationJohannes Berg2010-05-07
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-11
|\ \ \ \ \ \
| * | | | | | netfilter: use rcu_dereference_protected()Patrick McHardy2010-05-10
| * | | | | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-05-10
| |\ \ \ \ \ \
| * | | | | | | netfilter: nf_conntrack_proto: fix warning with CONFIG_PROVE_RCUPatrick McHardy2010-05-10
| * | | | | | | netfilter: nf_ct_h323: switch "incomplete TPKT" message to pr_debug()Patrick McHardy2010-05-01
| * | | | | | | netfilter: nf_conntrack: extend with extra stat counterJesper Dangaard Brouer2010-04-23
| * | | | | | | netfilter: ip_tables: convert pr_devel() to pr_debug()Patrick McHardy2010-04-22
| * | | | | | | netfilter: x_tables: move sleeping allocation outside BH-disabled regionJan Engelhardt2010-04-21
| * | | | | | | netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPP...Bart De Schuymer2010-04-20
| * | | | | | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-04-20
| |\ \ \ \ \ \ \
| * | | | | | | | netfilter: xt_TEE: resolve oif using netdevice notifiersPatrick McHardy2010-04-20
| * | | | | | | | netfilter: xtables: remove old comments about reentrancyJan Engelhardt2010-04-19
| * | | | | | | | netfilter: xt_TEE: have cloned packet travel through Xtables tooJan Engelhardt2010-04-19
| * | | | | | | | netfilter: xtables: make ip_tables reentrantJan Engelhardt2010-04-19
| * | | | | | | | netfilter: xtables: inclusion of xt_TEEJan Engelhardt2010-04-19
| * | | | | | | | netfilter: ipt_LOG/ip6t_LOG: use more appropriate log level as defaultPatrick McHardy2010-04-15
| * | | | | | | | netfilter: ipv6: move xfrm_lookup at end of ip6_route_me_harderUlrich Weber2010-04-15
| * | | | | | | | netfilter: bridge-netfilter: Fix MAC header handling with IP DNATBart De Schuymer2010-04-15
| * | | | | | | | netfilter: bridge-netfilter: simplify IP DNATBart De Schuymer2010-04-15
| * | | | | | | | netfilter: ipv6: add IPSKB_REROUTED exclusion to NF_HOOK/POSTROUTING invocationJan Engelhardt2010-04-13
| * | | | | | | | netfilter: ipv6: move POSTROUTING invocation before fragmentationJan Engelhardt2010-04-13
| * | | | | | | | netfilter: bridge-netfilter: update a comment in br_forward.c about ip_fragme...Bart De Schuymer2010-04-13
| * | | | | | | | netfilter: bridge-netfilter: cleanup br_netfilter.cBart De Schuymer2010-04-13
| * | | | | | | | netfilter: fix some coding styles and remove moduleparam.hZhitong Wang2010-04-13