]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/blobdiff - drivers/net/wireless/intersil/orinoco/main.c
networking: make skb_push & __skb_push return void pointers
[mirror_ubuntu-hirsute-kernel.git] / drivers / net / wireless / intersil / orinoco / main.c
index f7abc439fb927a8e52ccc517ccd05174be2d7862..28dac36d7c4cabef5606bebfd0f66550c8ccb5bb 100644 (file)
@@ -396,7 +396,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
                memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));
 
                /* Make room for the new header, and copy it in */
-               eh = (struct ethhdr *) skb_push(skb, ENCAPS_OVERHEAD);
+               eh = skb_push(skb, ENCAPS_OVERHEAD);
                memcpy(eh, &hdr, sizeof(hdr));
        }
 
@@ -1029,11 +1029,10 @@ static void orinoco_rx(struct net_device *dev,
                /* These indicate a SNAP within 802.2 LLC within
                   802.11 frame which we'll need to de-encapsulate to
                   the original EthernetII frame. */
-               hdr = (struct ethhdr *)skb_push(skb,
-                                               ETH_HLEN - ENCAPS_OVERHEAD);
+               hdr = skb_push(skb, ETH_HLEN - ENCAPS_OVERHEAD);
        } else {
                /* 802.3 frame - prepend 802.3 header as is */
-               hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN);
+               hdr = skb_push(skb, ETH_HLEN);
                hdr->h_proto = htons(length);
        }
        memcpy(hdr->h_dest, desc->addr1, ETH_ALEN);