Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306813
b: refs/heads/master
c: 294a20e
h: refs/heads/master
i:
  306811: 32bc51c
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed May 16, 2012
1 parent 3e1594f commit 1e22792
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3383b5a69de59eeef2501834c6e0960b7e2bff28
refs/heads/master: 294a20e039a5125b0e88b96e0ee47065ff4e07a5
6 changes: 3 additions & 3 deletions trunk/include/net/cfg80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -3365,9 +3365,9 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
* @chan: main channel
* @channel_type: HT mode
*/
int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type);
bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type);

/*
* cfg80211_ch_switch_notify - update wdev channel and notify userspace
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/wireless/chan.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ rdev_freq_to_chan(struct cfg80211_registered_device *rdev,
return chan;
}

int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type)
{
Expand Down

0 comments on commit 1e22792

Please sign in to comment.