diff --git a/[refs] b/[refs] index a22996069b3c..e76126b9d47d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3baed51f44dd6b6c7076d2de24d8aed291d8130 +refs/heads/master: 30d08a46ea2a4e44bc1a1f15f243af29c9150282 diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index 903683b1e5b8..1a3fe9ae4c49 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -1580,9 +1580,7 @@ struct cfg80211_gtk_rekey_data { * @set_cqm_txe_config: Configure connection quality monitor TX error * thresholds. * @sched_scan_start: Tell the driver to start a scheduled scan. - * @sched_scan_stop: Tell the driver to stop an ongoing scheduled - * scan. The driver_initiated flag specifies whether the driver - * itself has informed that the scan has stopped. + * @sched_scan_stop: Tell the driver to stop an ongoing scheduled scan. * * @mgmt_frame_register: Notify driver that a management frame type was * registered. Note that this callback may not sleep, and cannot run