This paper deals with linear and non-linear control of wind farms equipped with doubly-fed induction generators (DFIG). Both, active and reactive wind farm powers are employed in two independent control laws in order to increase the damping of the oscillation modes of a power system. In this way, it presented a general strategy where two correction terms are added, one by each independent control, to the normal operating condition of a wind farm. The proposed control laws are derived from the Lyapunov approach. Meanwhile for the reactive power a non-linear correction is presented, for the wind farm active power it is demonstrated that the classical proportional and inertial laws can be considered via the Lyapunov approach if wind farms are considered as real power plants, i.e. equivalent to conventional synchronous generation. Finally, some simulations are presented in order to support the theoretical considerations demonstrating the potential contributions of both control laws.