networking: make skb_put & friends return void pointers

[mirror_ubuntu-artful-kernel.git] / net / core / pktgen.c

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8860ad985d6851012c5d89e094b221e683e18258..b8bcf9021329632ddf9a6f6a6e377d6af9ed5548 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2714,7 +2714,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
        struct timeval timestamp;
        struct pktgen_hdr *pgh;
 
-       pgh = (struct pktgen_hdr *)skb_put(skb, sizeof(*pgh));
+       pgh = skb_put(skb, sizeof(*pgh));
        datalen -= sizeof(*pgh);
 
        if (pkt_dev->nfrags <= 0) {
@@ -2845,33 +2845,34 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
 
        /*  Reserve for ethernet and IP header  */
        eth = (__u8 *) skb_push(skb, 14);
-       mpls = (__be32 *)skb_put(skb, pkt_dev->nr_labels*sizeof(__u32));
+       mpls = skb_put(skb, pkt_dev->nr_labels * sizeof(__u32));
        if (pkt_dev->nr_labels)
                mpls_push(mpls, pkt_dev);
 
        if (pkt_dev->vlan_id != 0xffff) {
                if (pkt_dev->svlan_id != 0xffff) {
-                       svlan_tci = (__be16 *)skb_put(skb, sizeof(__be16));
+                       svlan_tci = skb_put(skb, sizeof(__be16));
                        *svlan_tci = build_tci(pkt_dev->svlan_id,
                                               pkt_dev->svlan_cfi,
                                               pkt_dev->svlan_p);
-                       svlan_encapsulated_proto = (__be16 *)skb_put(skb, sizeof(__be16));
+                       svlan_encapsulated_proto = skb_put(skb,
+                                                          sizeof(__be16));
                        *svlan_encapsulated_proto = htons(ETH_P_8021Q);
                }
-               vlan_tci = (__be16 *)skb_put(skb, sizeof(__be16));
+               vlan_tci = skb_put(skb, sizeof(__be16));
                *vlan_tci = build_tci(pkt_dev->vlan_id,
                                      pkt_dev->vlan_cfi,
                                      pkt_dev->vlan_p);
-               vlan_encapsulated_proto = (__be16 *)skb_put(skb, sizeof(__be16));
+               vlan_encapsulated_proto = skb_put(skb, sizeof(__be16));
                *vlan_encapsulated_proto = htons(ETH_P_IP);
        }
 
        skb_reset_mac_header(skb);
        skb_set_network_header(skb, skb->len);
-       iph = (struct iphdr *) skb_put(skb, sizeof(struct iphdr));
+       iph = skb_put(skb, sizeof(struct iphdr));
 
        skb_set_transport_header(skb, skb->len);
-       udph = (struct udphdr *) skb_put(skb, sizeof(struct udphdr));
+       udph = skb_put(skb, sizeof(struct udphdr));
        skb_set_queue_mapping(skb, queue_map);
        skb->priority = pkt_dev->skb_priority;
 
@@ -2972,33 +2973,34 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
 
        /*  Reserve for ethernet and IP header  */
        eth = (__u8 *) skb_push(skb, 14);
-       mpls = (__be32 *)skb_put(skb, pkt_dev->nr_labels*sizeof(__u32));
+       mpls = skb_put(skb, pkt_dev->nr_labels * sizeof(__u32));
        if (pkt_dev->nr_labels)
                mpls_push(mpls, pkt_dev);
 
        if (pkt_dev->vlan_id != 0xffff) {
                if (pkt_dev->svlan_id != 0xffff) {
-                       svlan_tci = (__be16 *)skb_put(skb, sizeof(__be16));
+                       svlan_tci = skb_put(skb, sizeof(__be16));
                        *svlan_tci = build_tci(pkt_dev->svlan_id,
                                               pkt_dev->svlan_cfi,
                                               pkt_dev->svlan_p);
-                       svlan_encapsulated_proto = (__be16 *)skb_put(skb, sizeof(__be16));
+                       svlan_encapsulated_proto = skb_put(skb,
+                                                          sizeof(__be16));
                        *svlan_encapsulated_proto = htons(ETH_P_8021Q);
                }
-               vlan_tci = (__be16 *)skb_put(skb, sizeof(__be16));
+               vlan_tci = skb_put(skb, sizeof(__be16));
                *vlan_tci = build_tci(pkt_dev->vlan_id,
                                      pkt_dev->vlan_cfi,
                                      pkt_dev->vlan_p);
-               vlan_encapsulated_proto = (__be16 *)skb_put(skb, sizeof(__be16));
+               vlan_encapsulated_proto = skb_put(skb, sizeof(__be16));
                *vlan_encapsulated_proto = htons(ETH_P_IPV6);
        }
 
        skb_reset_mac_header(skb);
        skb_set_network_header(skb, skb->len);
-       iph = (struct ipv6hdr *) skb_put(skb, sizeof(struct ipv6hdr));
+       iph = skb_put(skb, sizeof(struct ipv6hdr));
 
        skb_set_transport_header(skb, skb->len);
-       udph = (struct udphdr *) skb_put(skb, sizeof(struct udphdr));
+       udph = skb_put(skb, sizeof(struct udphdr));
        skb_set_queue_mapping(skb, queue_map);
        skb->priority = pkt_dev->skb_priority;