summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-03-157-12/+201
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-157-12/+201
| |\
| | * mac80211: fix channel type recalculation with HT and non-HT interfacesFelix Fietkau2011-03-141-0/+3
| | * mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devicesHelmut Schaa2011-03-141-7/+34
| | * mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-113-0/+95
| | * wireless: add support for ethtool_ops->{get,set}_ringparamJohn W. Linville2011-03-111-0/+33
| | * mac80211: do not enable ps if 802.1x controlled port is unblockedJason Young2011-03-112-5/+36
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-1521-394/+611
|\ \ \ | |/ / |/| |
| * | netfilter: xt_addrtype: ipv6 supportFlorian Westphal2011-03-152-2/+97
| * | netfilter: ipt_addrtype: rename to xt_addrtypeFlorian Westphal2011-03-155-26/+27
| * | ipv6: netfilter: ip6_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: ip_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: arp_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: xt_connlimit: remove connlimit_rnd_initedChangli Gao2011-03-151-4/+7
| * | netfilter: xt_connlimit: use hlist insteadChangli Gao2011-03-151-14/+14
| * | netfilter: xt_connlimit: use kmalloc() instead of kzalloc()Changli Gao2011-03-151-1/+1
| * | netfilter: xt_connlimit: fix daddr connlimit in SNAT scenarioChangli Gao2011-03-151-11/+9
| * | IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()Simon Horman2011-03-151-36/+62
| * | IPVS: Conditionally define and use ip_vs_lblc{r}_tableSimon Horman2011-03-152-9/+20
| * | IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefinedSimon Horman2011-03-151-2/+7
| * | IPVS: Conditinally use sysctl_lblc{r}_expirationSimon Horman2011-03-152-9/+28
| * | IPVS: Add expire_quiescent_template()Simon Horman2011-03-151-2/+11
| * | IPVS: Add sysctl_expire_nodest_conn()Simon Horman2011-03-151-1/+7
| * | IPVS: Add sysctl_sync_ver()Simon Horman2011-03-151-2/+2
| * | IPVS: Add {sysctl_sync_threshold,period}()Simon Horman2011-03-153-9/+9
| * | IPVS: Add sysctl_nat_icmp_send()Simon Horman2011-03-151-3/+8
| * | IPVS: Add sysctl_snat_reroute()Simon Horman2011-03-151-4/+16
| * | IPVS: Add ip_vs_route_me_harder()Simon Horman2011-03-151-26/+22
| * | ipvs: rename estimator functionsJulian Anastasov2011-03-152-8/+8
| * | ipvs: optimize rates readingJulian Anastasov2011-03-152-39/+25
| * | ipvs: properly zero stats and ratesJulian Anastasov2011-03-152-43/+68
| * | ipvs: reorganize tot_statsJulian Anastasov2011-03-153-26/+28
| * | netfilter:ipvs: use kmemdupShan Wei2011-03-152-7/+5
| * | ipvs: remove _bh from percpu stats readingJulian Anastasov2011-03-151-4/+4
| * | ipvs: avoid lookup for fwmark 0Julian Anastasov2011-03-151-3/+5
| * | netfilter: nf_conntrack: fix sysctl memory leakStephen Hemminger2011-03-141-0/+1
| * | netfilter: x_tables: return -ENOENT for non-existant matches/targetsPatrick McHardy2011-03-141-2/+2
| * | netfilter: x_tables: misuse of try_then_request_moduleStephen Hemminger2011-03-091-7/+15
| * | netfilter: ipset: fix the compile warning in ip_set_createShan Wei2011-03-081-1/+1
* | | net: dcbnl: Update copyright datesMark Rustad2011-03-141-1/+1
* | | bridge: control carrier based on ports onlinestephen hemminger2011-03-143-13/+27
* | | Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/pub/scm/linux/kernel/g...David S. Miller2011-03-141-1/+1
|\ \ \
| * | | tipc: delete extra semicolon blocking node deletionPaul Gortmaker2011-03-141-1/+1
* | | | pktgen: bug fix in transmission headers with frags=0Daniel Turull2011-03-141-2/+1
|/ / /
* | | inetpeer: should use call_rcu() variantEric Dumazet2011-03-131-1/+1
* | | xfrm: Add user interface for esn and big anti-replay windowsSteffen Klassert2011-03-132-14/+87
* | | xfrm: Add support for IPsec extended sequence numbersSteffen Klassert2011-03-132-1/+193
* | | xfrm: Support anti-replay window size bigger than 32 packetsSteffen Klassert2011-03-131-1/+206
* | | xfrm: Move IPsec replay detection functions to a separate fileSteffen Klassert2011-03-136-124/+154
* | | esp6: Add support for IPsec extended sequence numbersSteffen Klassert2011-03-131-19/+86
OpenPOWER on IntegriCloud