Skip to contentSkip to conversation

mac80211: Minor optimization in ieee80211_rx_h_data

PATCH In review Helmut Schaa 2 participants 2 messages Nov 30, 2010 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: Minor optimization in ieee80211_rx_h_data

Remove a superfluous ieee80211_is_data check as that was checked a few lines before already and we wont't get here for non-data frames at all.

Second, the frame was already converted to 802.3 header format and reading the fc and addr1 fields was only possible because the 802.3 header is short enough and didn't overwrite the relevant parts of the 802.11 header. Make the code more obvious by checking the ethernet header's h_dest field.

Furthermore reorder the conditions to reduce the number of checks when dynamic powersave is not needed (AP mode for example).

---

Found via code review, compile tested only.

 net/mac80211/rx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
net/mac80211/rx.c +2 -3
index 9dd60a7..9e44fbf 100644
@@ -1871,9 +1871,8 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += rx->skb->len;
 
-	if (ieee80211_is_data(hdr->frame_control) &&
-	    !is_multicast_ether_addr(hdr->addr1) &&
-	    local->hw.conf.dynamic_ps_timeout > 0 && local->ps_sdata) {
+	if (local->ps_sdata && local->hw.conf.dynamic_ps_timeout > 0 && 
+	    !is_multicast_ether_addr(((struct ethhdr *)rx->skb->data)->h_dest)) {
 			mod_timer(&local->dynamic_ps_timer, jiffies +
 			 msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
 	}
Signature · 1 line
1.7.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Helmut Schaa

Remove a superfluous ieee80211_is_data check as that was checked a few lines before already and we wont't get here for non-data frames at all.

Second, the frame was already converted to 802.3 header format and reading the fc and addr1 fields was only possible because the 802.3 header is short enough and didn't overwrite the relevant parts of the 802.11 header. Make the code more obvious by checking the ethernet header's h_dest field.

Quoted 5 lines

Furthermore reorder the conditions to reduce the number of checks when dynamic powersave is not needed (AP mode for example).

Looks sane to me. Indeed if the check was required it should use the "fc" variable, but clearly it's pointless. Must be some code that got moved during PS code restructuring...

Quoted 23 lines

---

Found via code review, compile tested only.

 net/mac80211/rx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
net/mac80211/rx.c +2 -3
index 9dd60a7..9e44fbf 100644
@@ -1871,9 +1871,8 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += rx->skb->len;
 
-	if (ieee80211_is_data(hdr->frame_control) &&
-	    !is_multicast_ether_addr(hdr->addr1) &&
-	    local->hw.conf.dynamic_ps_timeout > 0 && local->ps_sdata) {
+	if (local->ps_sdata && local->hw.conf.dynamic_ps_timeout > 0 && 
+	    !is_multicast_ether_addr(((struct ethhdr *)rx->skb->data)->h_dest)) {
 			mod_timer(&local->dynamic_ps_timer, jiffies +
 			 msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
 	}