aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l2tp: fix potential rcu raceEric Dumazet2011-05-121-6/+4
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-1137-217/+401
|\
| * Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-1014-161/+279
| |\
| | * netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0Pablo Neira Ayuso2011-05-101-5/+0
| | * netfilter: IPv6: fix DSCP mangle codeFernando Luis Vazquez Cao2011-05-101-1/+1
| | * netfilter: IPv6: initialize TOS field in REJECT target moduleFernando Luis Vazquez Cao2011-05-101-1/+3
| | * IPVS: init and cleanup restructuringHans Schillstrom2011-05-108-80/+223
| | * IPVS: Change of socket usage to enable name space exit.Hans Schillstrom2011-05-102-22/+38
| | * netfilter: ebtables: only call xt_compat_add_offset once per ruleFlorian Westphal2011-05-101-52/+9
| | * netfilter: fix ebtables compat supportEric Dumazet2011-05-102-3/+4
| | * netfilter: ctnetlink: fix timestamp support for new conntracksPablo Neira Ayuso2011-05-101-0/+4
| * | slcan: fix ldisc->open retvalOliver Hartkopp2011-05-101-1/+3
| * | net/usb: mark LG VL600 LTE modem ethernet interface as WWANDan Williams2011-05-101-1/+1
| * | xfrm: Don't allow esn with disabled anti replay detectionSteffen Klassert2011-05-101-0/+3
| * | xfrm: Assign the inner mode output function to the dst entrySteffen Klassert2011-05-106-6/+27
| * | net: dev_close() should check IFF_UPEric Dumazet2011-05-101-4/+6
| * | vlan: fix GVRP at dismantle timeEric Dumazet2011-05-102-3/+3
| * | pch_gbe: support ML7223 IOHTomoya2011-05-092-1/+18
| * | PCH_GbE : Fixed the issue of checksum judgmentToshiharu Okada2011-05-091-5/+4
| * | PCH_GbE : Fixed the issue of collision detectionToshiharu Okada2011-05-091-2/+1
| * | NET: slip, fix ldisc->open retvalMatvejchikov Ilya2011-05-091-1/+3
| * | be2net: Fixed bugs related to PVID.Somnath Kotur2011-05-093-8/+14
| * | ehea: fix wrongly reported speed and portKleber Sacilotto de Souza2011-05-091-8/+13
| * | tcp_cubic: limit delayed_ack ratio to prevent divide errorstephen hemminger2011-05-081-2/+7
| * | ipheth: Properly distinguish length and alignment in URBs and skbsBen Hutchings2011-05-081-5/+9
| * | vmxnet3: Consistently disable irqs when taking adapter->cmd_lockRoland Dreier2011-05-061-4/+6
| * | dccp: handle invalid feature options lengthDan Rosenberg2011-05-061-0/+2
| |/
* | Merge branch 'tipc-May10-2011' of git://git.kernel.org/pub/scm/linux/kernel/g...David S. Miller2011-05-1115-310/+321
|\ \
| * | tipc: Revise timings used when sending link request messagesAllan Stephens2011-05-101-30/+36
| * | tipc: Add monitoring of number of nodes discovered by bearerAllan Stephens2011-05-103-8/+31
| * | tipc: Enhance sending of discovery object link request messagesAllan Stephens2011-05-101-1/+13
| * | tipc: Enhance handling of discovery object creation failuresAllan Stephens2011-05-103-41/+42
| * | tipc: Introduce routine to enqueue a chain of messages on link tx queueAllan Stephens2011-05-101-16/+22
| * | tipc: Avoid recomputation of outgoing message lengthAllan Stephens2011-05-108-66/+64
| * | tipc: Abort excessive send requests as early as possibleAllan Stephens2011-05-102-1/+14
| * | tipc: Strengthen checks for neighboring node discoveryAllan Stephens2011-05-102-4/+14
| * | tipc: make zone/cluster mask constants a definePaul Gortmaker2011-05-101-2/+5
| * | tipc: Fix sk_buff leaks when link congestion is detectedAllan Stephens2011-05-102-7/+4
| * | tipc: Update destination node field on incoming multicast messagesAllan Stephens2011-05-101-0/+1
| * | tipc: Fix problem with bundled multicast messageAllan Stephens2011-05-101-0/+2
| * | tipc: Set name lookup scope field properly in all data messagesAllan Stephens2011-05-101-0/+3
| * | tipc: Fix issues with fragmentation of an existing message bufferAllan Stephens2011-05-101-14/+23
| * | tipc: Avoid pointless masking of fragmented message identifierAllan Stephens2011-05-101-2/+2
| * | tipc: Don't initialize link selector field in fragmented messagesAllan Stephens2011-05-101-2/+0
| * | tipc: Remove code to emulate loss of broadcast messagesAllan Stephens2011-05-101-18/+0
| * | tipc: Cosmetic consolidation of internal message type definitionsAllan Stephens2011-05-101-29/+29
| * | tipc: Eliminate unused routing message definitionsAllan Stephens2011-05-101-9/+0
| * | tipc: Update comments in message header include fileAllan Stephens2011-05-101-66/+23
| * | tipc: Drop __TIME__ usageMichal Marek2011-05-101-2/+1
* | | net: fix two lockdep splatsEric Dumazet2011-05-101-2/+2