diff --git a/[refs] b/[refs] index 629726040752..4f7b7cdd7779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98ef55f66f791a04877c9e0a272a8c50cceaf9a5 +refs/heads/master: 1432de0784fc745dd2ed334d8d90f888a9ed3d8a diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index ce6236b5473d..f0e82b2e4227 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -1402,7 +1402,8 @@ struct cfg80211_gtk_rekey_data { * have changed. The actual parameter values are available in * struct wiphy. If returning an error, no value should be changed. * - * @set_tx_power: set the transmit power according to the parameters + * @set_tx_power: set the transmit power according to the parameters, + * the power passed is in mBm, to get dBm use MBM_TO_DBM(). * @get_tx_power: store the current TX power into the dbm variable; * return 0 if successful *