summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-1212-23/+79
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-1110-21/+77
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-05-101-1/+2
| | |\
| | | * mac80211: remove association work when processing deauth requestReinette Chatre2010-05-071-1/+2
| | * | net: Fix FDDI and TR config checks in ipv4 arp and LLC.David S. Miller2010-05-102-4/+4
| | * | IPv4: unresolved multicast route cleanupAndreas Meissner2010-05-101-1/+2
| | * | ipv4: udp: fix short packet and bad checksum loggingBjørn Mork2010-05-061-3/+3
| | * | sctp: Fix a race between ICMP protocol unreachable and connect()Vlad Yasevich2010-05-063-4/+55
| | * | veth: Dont kfree_skb() after dev_forward_skb()Eric Dumazet2010-05-061-6/+5
| | * | IPv6: fix IPV6_RECVERR handling of locally-generated errorsBrian Haley2010-05-051-2/+6
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-052-6/+58
| |\ \ \ | | |/ /
| | * | ipv6: Fix default multicast hops setting.David S. Miller2010-05-031-1/+1
| * | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-04-291-1/+1
| |\ \ \
| | * | | SUNRPC: Fix a bug in rpcauth_prune_expiredTrond Myklebust2010-04-221-1/+1
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-05-1116-139/+412
|\ \ \ \ \
| * | | | | mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beaconsJohn W. Linville2010-05-071-2/+3
| * | | | | mac80211: improve HT channel handlingJohannes Berg2010-05-076-31/+118
| * | | | | cfg80211/mac80211: better channel handlingJohannes Berg2010-05-0711-104/+274
| * | | | | mac80211: fix BSS info reconfigurationJohannes Berg2010-05-071-5/+20
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-10137-2045/+1911
|\ \ \ \ \ \
| * | | | | | netfilter: use rcu_dereference_protected()Patrick McHardy2010-05-102-6/+26
| * | | | | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-05-10139-2480/+3662
| |\ \ \ \ \ \
| * | | | | | | netfilter: nf_conntrack_proto: fix warning with CONFIG_PROVE_RCUPatrick McHardy2010-05-101-1/+5
| * | | | | | | netfilter: nf_ct_h323: switch "incomplete TPKT" message to pr_debug()Patrick McHardy2010-05-011-2/+1
| * | | | | | | netfilter: nf_conntrack: extend with extra stat counterJesper Dangaard Brouer2010-04-233-7/+11
| * | | | | | | netfilter: ip_tables: convert pr_devel() to pr_debug()Patrick McHardy2010-04-221-5/+5
| * | | | | | | netfilter: x_tables: move sleeping allocation outside BH-disabled regionJan Engelhardt2010-04-211-6/+6
| * | | | | | | netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPP...Bart De Schuymer2010-04-202-1/+5
| * | | | | | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-04-20565-3414/+17553
| |\ \ \ \ \ \ \
| * | | | | | | | netfilter: xt_TEE: resolve oif using netdevice notifiersPatrick McHardy2010-04-201-23/+80
| * | | | | | | | netfilter: xtables: remove old comments about reentrancyJan Engelhardt2010-04-194-10/+0
| * | | | | | | | netfilter: xt_TEE: have cloned packet travel through Xtables tooJan Engelhardt2010-04-193-24/+18
| * | | | | | | | netfilter: xtables: make ip_tables reentrantJan Engelhardt2010-04-194-66/+138
| * | | | | | | | netfilter: xtables: inclusion of xt_TEEJan Engelhardt2010-04-195-0/+266
| * | | | | | | | netfilter: ipt_LOG/ip6t_LOG: use more appropriate log level as defaultPatrick McHardy2010-04-152-2/+2
| * | | | | | | | netfilter: ipv6: move xfrm_lookup at end of ip6_route_me_harderUlrich Weber2010-04-151-14/+11
| * | | | | | | | netfilter: bridge-netfilter: Fix MAC header handling with IP DNATBart De Schuymer2010-04-151-25/+65
| * | | | | | | | netfilter: bridge-netfilter: simplify IP DNATBart De Schuymer2010-04-152-97/+26
| * | | | | | | | netfilter: ipv6: add IPSKB_REROUTED exclusion to NF_HOOK/POSTROUTING invocationJan Engelhardt2010-04-131-2/+3
| * | | | | | | | netfilter: ipv6: move POSTROUTING invocation before fragmentationJan Engelhardt2010-04-131-26/+23
| * | | | | | | | netfilter: bridge-netfilter: update a comment in br_forward.c about ip_fragme...Bart De Schuymer2010-04-131-1/+1
| * | | | | | | | netfilter: bridge-netfilter: cleanup br_netfilter.cBart De Schuymer2010-04-131-56/+2
| * | | | | | | | netfilter: fix some coding styles and remove moduleparam.hZhitong Wang2010-04-133-5/+1
| * | | | | | | | netfilter: xt_LED: add refcounts to LED targetAdam Nielsen2010-04-091-6/+63
| * | | | | | | | netfilter: remove invalid rcu_dereference() callsPatrick McHardy2010-04-092-20/+6
| * | | | | | | | netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in nfnetlink_queueHerbert Xu2010-04-081-2/+1
| * | | | | | | | netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip6_queueHerbert Xu2010-04-081-2/+1
| * | | | | | | | netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip_queueHerbert Xu2010-04-081-2/+1
| * | | | | | | | IPVS: fix potential stack overflow with overly long protocol namesPatrick McHardy2010-04-082-24/+18
| * | | | | | | | netfilter: xt_hashlimit: RCU conversionEric Dumazet2010-04-011-23/+47
OpenPOWER on IntegriCloud