Merge branch 'reset_mac_header'

Zhang Shengju says:

====================
use reset to set header pointers

This patch series replace set function with reset when offset is zero.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 775ddb48388d68329a3c60c31936a5f5ad972a22..8ca243d93b781acb1bdd612dee90c8722b4b21f1 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1460,7 +1460,7 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
        reply->dev = dev;
        skb_reserve(reply, LL_RESERVED_SPACE(request->dev));
        skb_push(reply, sizeof(struct ethhdr));
-       skb_set_mac_header(reply, 0);
+       skb_reset_mac_header(reply);
 
        ns = (struct nd_msg *)skb_transport_header(request);
 
@@ -1480,7 +1480,7 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
        reply->protocol = htons(ETH_P_IPV6);
 
        skb_pull(reply, sizeof(struct ethhdr));
-       skb_set_network_header(reply, 0);
+       skb_reset_network_header(reply);
        skb_put(reply, sizeof(struct ipv6hdr));
 
        /* IPv6 header */
@@ -1495,7 +1495,7 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
        pip6->saddr = *(struct in6_addr *)n->primary_key;
 
        skb_pull(reply, sizeof(struct ipv6hdr));
-       skb_set_transport_header(reply, 0);
+       skb_reset_transport_header(reply);
 
        na = (struct nd_msg *)skb_put(reply, sizeof(*na) + na_olen);
 

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a723a85f5635716aae4afa86cc1d45657f899af0..e85e0737771c87e4b9d445e3fa998d8eb0bbfc28 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -844,7 +844,7 @@ static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,
        hdr->rt_chbitmask = cpu_to_le16(flags);
 
        skb->dev = hwsim_mon;
-       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);
@@ -887,7 +887,7 @@ static void mac80211_hwsim_monitor_ack(struct ieee80211_channel *chan,
        memcpy(hdr11->addr1, addr, ETH_ALEN);
 
        skb->dev = hwsim_mon;
-       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);

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index c6be0b4f405888489b21cee009b267d95f626c34..5b6aec1a06302c7b5efac015a5e50d5239242406 100644 (file)
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -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);

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 91279576f4a716d00cfd810e5d6db18306520c1c..5690e4c67486b88a23bb9724f6cfeb6ce3181410 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -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);

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 6101deb805a830a80acccbe05499ca4f4fc33988..8b1b2ea03eb5a13cc291c8d5e389b045e983ee47 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -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);

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 3a7475ff1a413c1dd7281af1c5483c64583aa9cd..62ad5321257d0679918c0f1e21ed716b221a3bf4 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -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;

diff --git a/net/wireless/util.c b/net/wireless/util.c
index c7f6820bb25816346e35cd9935abed06446eafae..9f440a9de63b486e5fd565533fa01975621abbbb 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -636,7 +636,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
        /* 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);