diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-24 00:04:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-24 00:04:20 -0500 |
| commit | f74290fdb363665538743d14c4f00aeacdb68d87 (patch) | |
| tree | a5c8f6332f06550e935d1e557ac927302f7f63c4 /include/net | |
| parent | 1b71af6053af1bd2f849e9fda4f71c1e3f145dcf (diff) | |
| parent | 9cb9c07d6b0c5fd97d83b8ab14d7e308ba4b612f (diff) | |
| download | blackbird-obmc-linux-f74290fdb363665538743d14c4f00aeacdb68d87.tar.gz blackbird-obmc-linux-f74290fdb363665538743d14c4f00aeacdb68d87.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 2 | ||||
| -rw-r--r-- | include/net/regulatory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index dc3e9d9c3527..2fd59ed3be00 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -4168,7 +4168,7 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); * The TX headroom reserved by mac80211 for its own tx_status functions. * This is enough for the radiotap header. */ -#define IEEE80211_TX_STATUS_HEADROOM 14 +#define IEEE80211_TX_STATUS_HEADROOM ALIGN(14, 4) /** * ieee80211_sta_set_buffered - inform mac80211 about driver-buffered frames diff --git a/include/net/regulatory.h b/include/net/regulatory.h index ebc5a2ed8631..f83cacce3308 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -78,7 +78,7 @@ struct regulatory_request { int wiphy_idx; enum nl80211_reg_initiator initiator; enum nl80211_user_reg_hint_type user_reg_hint_type; - char alpha2[2]; + char alpha2[3]; enum nl80211_dfs_regions dfs_region; bool intersect; bool processed; |
