History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 13 years ago

Commit 57ed5cd2 parents 5e6700b 0f817ed119 files · +3772 −3098Browse files

Showing the changes to include/uapi/linux (1 of 119 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+4−0
@@ -2758,6 +2758,8 @@ enum nl80211_channel_type { · 2757 unmodified lines
2758 * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well2758 * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
2759 * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ12759 * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
2760 * attribute must be provided as well2760 * attribute must be provided as well
2761 * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
2762 * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
2761 */2763 */
2762enum nl80211_chan_width {2764enum nl80211_chan_width {
2763 NL80211_CHAN_WIDTH_20_NOHT,2765 NL80211_CHAN_WIDTH_20_NOHT,
@@ -2766,6 +2768,8 @@ enum nl80211_chan_width { · 2 unmodified lines
2766 NL80211_CHAN_WIDTH_80,2768 NL80211_CHAN_WIDTH_80,
2767 NL80211_CHAN_WIDTH_80P80,2769 NL80211_CHAN_WIDTH_80P80,
2768 NL80211_CHAN_WIDTH_160,2770 NL80211_CHAN_WIDTH_160,
2771 NL80211_CHAN_WIDTH_5,
2772 NL80211_CHAN_WIDTH_10,
2769};2773};
2770 2774
2771/**2775/**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t