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

Commit f248f105 authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

mac80211_hwsim: Minor cleanup 



Remove unnecessary '__constant_' prefix and use the atomic version of
ieee80211_iterate_active_interfaces().

Signed-off-by: default avatarJouni Malinen <j@w1.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ba77f1ab

drivers/net/wireless/mac80211_hwsim.c

+6 −6
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw, 
	hdr->hdr.it_version = PKTHDR_RADIOTAP_VERSION;

	hdr->hdr.it_pad = 0;

	hdr->hdr.it_len = cpu_to_le16(sizeof(*hdr));

	hdr->hdr.it_present = __constant_cpu_to_le32(

	     (1 << IEEE80211_RADIOTAP_FLAGS) |

	hdr->hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |

					  (1 << IEEE80211_RADIOTAP_RATE) |

					  (1 << IEEE80211_RADIOTAP_CHANNEL));

	hdr->rt_flags = 0;
@@ -139,7 +138,7 @@ static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw, 
	skb_set_mac_header(skb, 0);

	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->pkt_type = PACKET_OTHERHOST;

	skb->protocol = __constant_htons(ETH_P_802_2);

	skb->protocol = htons(ETH_P_802_2);

	memset(skb->cb, 0, sizeof(skb->cb));

	netif_rx(skb);

}
@@ -309,7 +308,8 @@ static void mac80211_hwsim_beacon(unsigned long arg) 
	if (!data->started || !data->radio_enabled)

		return;



	ieee80211_iterate_active_interfaces(hw, mac80211_hwsim_beacon_tx, hw);

	ieee80211_iterate_active_interfaces_atomic(

		hw, mac80211_hwsim_beacon_tx, hw);



	data->beacon_timer.expires = jiffies + data->beacon_int;

	add_timer(&data->beacon_timer);