mac80211: use reset to set header pointer
authorZhang Shengju <zhangshengju@cmss.chinamobile.com>
Thu, 3 Mar 2016 01:16:56 +0000 (01:16 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 5 Mar 2016 03:45:13 +0000 (22:45 -0500)
Since offset is zero, it's not necessary to use set function. Reset
function is straightforward, and will remove the unnecessary add
operation in set function.

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mac80211/mesh_hwmp.c
net/mac80211/rx.c
net/mac80211/status.c
net/mac80211/tx.c

index c6be0b4f405888489b21cee009b267d95f626c34..5b6aec1a06302c7b5efac015a5e50d5239242406 100644 (file)
@@ -205,9 +205,9 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 
-       skb_set_mac_header(skb, 0);
-       skb_set_network_header(skb, 0);
-       skb_set_transport_header(skb, 0);
+       skb_reset_mac_header(skb);
+       skb_reset_network_header(skb);
+       skb_reset_transport_header(skb);
 
        /* Send all internal mgmt frames on VO. Accordingly set TID to 7. */
        skb_set_queue_mapping(skb, IEEE80211_AC_VO);
index 91279576f4a716d00cfd810e5d6db18306520c1c..5690e4c67486b88a23bb9724f6cfeb6ce3181410 100644 (file)
@@ -3101,7 +3101,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
        ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom,
                                         false);
 
-       skb_set_mac_header(skb, 0);
+       skb_reset_mac_header(skb);
        skb->ip_summed = CHECKSUM_UNNECESSARY;
        skb->pkt_type = PACKET_OTHERHOST;
        skb->protocol = htons(ETH_P_802_2);
index 6101deb805a830a80acccbe05499ca4f4fc33988..8b1b2ea03eb5a13cc291c8d5e389b045e983ee47 100644 (file)
@@ -697,7 +697,7 @@ void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,
                                         rtap_len, shift);
 
        /* XXX: is this sufficient for BPF? */
-       skb_set_mac_header(skb, 0);
+       skb_reset_mac_header(skb);
        skb->ip_summed = CHECKSUM_UNNECESSARY;
        skb->pkt_type = PACKET_OTHERHOST;
        skb->protocol = htons(ETH_P_802_2);
index 3a7475ff1a413c1dd7281af1c5483c64583aa9cd..62ad5321257d0679918c0f1e21ed716b221a3bf4 100644 (file)
@@ -2458,7 +2458,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
        /* Update skb pointers to various headers since this modified frame
         * is going to go through Linux networking code that may potentially
         * need things like pointer to IP header. */
-       skb_set_mac_header(skb, 0);
+       skb_reset_mac_header(skb);
        skb_set_network_header(skb, nh_pos);
        skb_set_transport_header(skb, h_pos);
 
@@ -3973,9 +3973,9 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata,
 {
        int ac = ieee802_1d_to_ac[tid & 7];
 
-       skb_set_mac_header(skb, 0);
-       skb_set_network_header(skb, 0);
-       skb_set_transport_header(skb, 0);
+       skb_reset_mac_header(skb);
+       skb_reset_network_header(skb);
+       skb_reset_transport_header(skb);
 
        skb_set_queue_mapping(skb, ac);
        skb->priority = tid;