Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b18bf973 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mvm: fix merge error 



The iwlwifi-next tree removed IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC
while the mac80211-next tree removed

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e9b89fcc

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_AMPDU_AGGREGATION;