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

Commit e414eea7 authored Jun 16, 2015 by Johannes Berg

mac80211: remove IEEE80211_RX_FRAGMENTED



There's a long-standing TODO item to use this flag in the cooked
monitor RX, but clearly it was never needed and now this hasn't
been used by userspace for a long time, so no userspace changes
could require it now.

Remove the unused flag.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent ac100ce5

net/mac80211/ieee80211_i.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ typedef unsigned __bitwise__ ieee80211_rx_result;

		/**
		* enum ieee80211_packet_rx_flags - packet RX flags
		* @IEEE80211_RX_FRAGMENTED: fragmented frame
		* @IEEE80211_RX_AMSDU: a-MSDU packet
		* @IEEE80211_RX_MALFORMED_ACTION_FRM: action frame is malformed
		* @IEEE80211_RX_DEFERRED_RELEASE: frame was subjected to receive reordering
		@@ -190,7 +189,6 @@ typedef unsigned __bitwise__ ieee80211_rx_result;
		* @rx_flags field of &struct ieee80211_rx_status.
		*/
		enum ieee80211_packet_rx_flags {
		IEEE80211_RX_FRAGMENTED = BIT(2),
		IEEE80211_RX_AMSDU = BIT(3),
		IEEE80211_RX_MALFORMED_ACTION_FRM = BIT(4),
		IEEE80211_RX_DEFERRED_RELEASE = BIT(5),

net/mac80211/rx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1917,7 +1917,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)

		/* Complete frame has been reassembled - process it now */
		status = IEEE80211_SKB_RXCB(rx->skb);
		status->rx_flags \|= IEEE80211_RX_FRAGMENTED;

		out:
		ieee80211_led_rx(rx->local);
		@@ -3037,7 +3036,6 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
		return RX_QUEUED;
		}

		/* TODO: use IEEE80211_RX_FRAGMENTED */
		static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
		struct ieee80211_rate *rate)
		{