diff options
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index c9e2660e1263..114364b5d466 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -937,7 +937,9 @@ static int fill_ctrlset(struct zd_mac *mac, | |||
937 | * control block of the skbuff will be initialized. If necessary the incoming | 937 | * control block of the skbuff will be initialized. If necessary the incoming |
938 | * mac80211 queues will be stopped. | 938 | * mac80211 queues will be stopped. |
939 | */ | 939 | */ |
940 | static void zd_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 940 | static void zd_op_tx(struct ieee80211_hw *hw, |
941 | struct ieee80211_tx_control *control, | ||
942 | struct sk_buff *skb) | ||
941 | { | 943 | { |
942 | struct zd_mac *mac = zd_hw_mac(hw); | 944 | struct zd_mac *mac = zd_hw_mac(hw); |
943 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 945 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
@@ -1176,7 +1178,7 @@ static void zd_beacon_done(struct zd_mac *mac) | |||
1176 | skb = ieee80211_get_buffered_bc(mac->hw, mac->vif); | 1178 | skb = ieee80211_get_buffered_bc(mac->hw, mac->vif); |
1177 | if (!skb) | 1179 | if (!skb) |
1178 | break; | 1180 | break; |
1179 | zd_op_tx(mac->hw, skb); | 1181 | zd_op_tx(mac->hw, NULL, skb); |
1180 | } | 1182 | } |
1181 | 1183 | ||
1182 | /* | 1184 | /* |
@@ -1399,7 +1401,8 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf) | |||
1399 | 1401 | ||
1400 | hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | | 1402 | hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | |
1401 | IEEE80211_HW_SIGNAL_UNSPEC | | 1403 | IEEE80211_HW_SIGNAL_UNSPEC | |
1402 | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING; | 1404 | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | |
1405 | IEEE80211_HW_MFP_CAPABLE; | ||
1403 | 1406 | ||
1404 | hw->wiphy->interface_modes = | 1407 | hw->wiphy->interface_modes = |
1405 | BIT(NL80211_IFTYPE_MESH_POINT) | | 1408 | BIT(NL80211_IFTYPE_MESH_POINT) | |