diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:54:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-25 15:54:32 -0400 |
commit | 5419575e838cd2cd11a1b30449eb58decdf51f9f (patch) | |
tree | 36b20c033f58751fe11b71938738ad2cb39b20d0 /include/net/cfg80211.h | |
parent | 0c49b69931a0001912bb4e48c415d33031ddb217 (diff) | |
parent | 64629b9d412544b0ed744405944fd6edf79d7e0d (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r-- | include/net/cfg80211.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 903683b1e5b..ab78b53bd6f 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1580,9 +1580,7 @@ struct cfg80211_gtk_rekey_data { | |||
1580 | * @set_cqm_txe_config: Configure connection quality monitor TX error | 1580 | * @set_cqm_txe_config: Configure connection quality monitor TX error |
1581 | * thresholds. | 1581 | * thresholds. |
1582 | * @sched_scan_start: Tell the driver to start a scheduled scan. | 1582 | * @sched_scan_start: Tell the driver to start a scheduled scan. |
1583 | * @sched_scan_stop: Tell the driver to stop an ongoing scheduled | 1583 | * @sched_scan_stop: Tell the driver to stop an ongoing scheduled scan. |
1584 | * scan. The driver_initiated flag specifies whether the driver | ||
1585 | * itself has informed that the scan has stopped. | ||
1586 | * | 1584 | * |
1587 | * @mgmt_frame_register: Notify driver that a management frame type was | 1585 | * @mgmt_frame_register: Notify driver that a management frame type was |
1588 | * registered. Note that this callback may not sleep, and cannot run | 1586 | * registered. Note that this callback may not sleep, and cannot run |
@@ -1630,7 +1628,7 @@ struct cfg80211_ops { | |||
1630 | void (*set_wakeup)(struct wiphy *wiphy, bool enabled); | 1628 | void (*set_wakeup)(struct wiphy *wiphy, bool enabled); |
1631 | 1629 | ||
1632 | struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy, | 1630 | struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy, |
1633 | char *name, | 1631 | const char *name, |
1634 | enum nl80211_iftype type, | 1632 | enum nl80211_iftype type, |
1635 | u32 *flags, | 1633 | u32 *flags, |
1636 | struct vif_params *params); | 1634 | struct vif_params *params); |
@@ -3363,6 +3361,25 @@ void cfg80211_new_sta(struct net_device *dev, const u8 *mac_addr, | |||
3363 | void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp); | 3361 | void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp); |
3364 | 3362 | ||
3365 | /** | 3363 | /** |
3364 | * cfg80211_conn_failed - connection request failed notification | ||
3365 | * | ||
3366 | * @dev: the netdev | ||
3367 | * @mac_addr: the station's address | ||
3368 | * @reason: the reason for connection failure | ||
3369 | * @gfp: allocation flags | ||
3370 | * | ||
3371 | * Whenever a station tries to connect to an AP and if the station | ||
3372 | * could not connect to the AP as the AP has rejected the connection | ||
3373 | * for some reasons, this function is called. | ||
3374 | * | ||
3375 | * The reason for connection failure can be any of the value from | ||
3376 | * nl80211_connect_failed_reason enum | ||
3377 | */ | ||
3378 | void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr, | ||
3379 | enum nl80211_connect_failed_reason reason, | ||
3380 | gfp_t gfp); | ||
3381 | |||
3382 | /** | ||
3366 | * cfg80211_rx_mgmt - notification of received, unprocessed management frame | 3383 | * cfg80211_rx_mgmt - notification of received, unprocessed management frame |
3367 | * @wdev: wireless device receiving the frame | 3384 | * @wdev: wireless device receiving the frame |
3368 | * @freq: Frequency on which the frame was received in MHz | 3385 | * @freq: Frequency on which the frame was received in MHz |