Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af72868b authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

networking: make skb_pull & friends return void pointers 



It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.

Make these functions return void * and remove all the casts across
the tree, adding a (u8 *) cast only where the unsigned char pointer
was used directly, all done with the following spatch:

    @@
    expression SKB, LEN;
    typedef u8;
    identifier fn = {
            skb_pull,
            __skb_pull,
            skb_pull_inline,
            __pskb_pull_tail,
            __pskb_pull,
            pskb_pull
    };
    @@
    - *(fn(SKB, LEN))
    + *(u8 *)fn(SKB, LEN)

    @@
    expression E, SKB, LEN;
    identifier fn = {
            skb_pull,
            __skb_pull,
            skb_pull_inline,
            __pskb_pull_tail,
            __pskb_pull,
            pskb_pull
    };
    type T;
    @@
    - E = ((T *)(fn(SKB, LEN)))
    + E = fn(SKB, LEN)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4df864c1

drivers/bluetooth/hci_nokia.c

+2 −2
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int nokia_recv_negotiation_packet(struct hci_dev *hdev, 
		goto finish_neg;

	}



	evt = (struct hci_nokia_neg_evt *)skb_pull(skb, sizeof(*hdr));

	evt = skb_pull(skb, sizeof(*hdr));



	if (evt->ack != NOKIA_NEG_ACK) {

		dev_err(dev, "Negotiation received: wrong reply");
@@ -595,7 +595,7 @@ static int nokia_recv_alive_packet(struct hci_dev *hdev, struct sk_buff *skb) 
		goto finish_alive;

	}



	pkt = (struct hci_nokia_alive_pkt *)skb_pull(skb, sizeof(*hdr));

	pkt = skb_pull(skb, sizeof(*hdr));



	if (pkt->mid != NOKIA_ALIVE_RESP) {

		dev_err(dev, "Alive received: invalid response: 0x%02x!",

drivers/isdn/i4l/isdn_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -1509,7 +1509,7 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) 
	 * temporarily remove part of the fake header stuck on

	 * earlier.

	 */

	*skb_pull(skb, IPPP_MAX_HEADER - 4) = 1; /* indicate outbound */

	*(u8 *)skb_pull(skb, IPPP_MAX_HEADER - 4) = 1; /* indicate outbound */



	{

		__be16 *p = (__be16 *)skb->data;

drivers/net/wan/hdlc_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int ppp_rx(struct sk_buff *skb) 
	/* Check HDLC header */

	if (skb->len < sizeof(struct hdlc_header))

		goto rx_error;

	cp = (struct cp_header*)skb_pull(skb, sizeof(struct hdlc_header));

	cp = skb_pull(skb, sizeof(struct hdlc_header));

	if (hdr->address != HDLC_ADDR_ALLSTATIONS ||

	    hdr->control != HDLC_CTRL_UI)

		goto rx_error;

drivers/nfc/nxp-nci/firmware.c

+1 −2
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ void nxp_nci_fw_recv_frame(struct nci_dev *ndev, struct sk_buff *skb) 
		if (nxp_nci_fw_check_crc(skb) != 0x00)

			fw_info->cmd_result = -EBADMSG;

		else

			fw_info->cmd_result = nxp_nci_fw_read_status(

					*skb_pull(skb, NXP_NCI_FW_HDR_LEN));

			fw_info->cmd_result = nxp_nci_fw_read_status(*(u8 *)skb_pull(skb, NXP_NCI_FW_HDR_LEN));

		kfree_skb(skb);

	} else {

		fw_info->cmd_result = -EIO;

drivers/scsi/fnic/fnic_fcs.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static inline int fnic_import_rq_eth_pkt(struct fnic *fnic, struct sk_buff *skb) 
	eh = (struct ethhdr *)skb->data;

	if (eh->h_proto == htons(ETH_P_8021Q)) {

		memmove((u8 *)eh + VLAN_HLEN, eh, ETH_ALEN * 2);

		eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN);

		eh = skb_pull(skb, VLAN_HLEN);

		skb_reset_mac_header(skb);

	}

	if (eh->h_proto == htons(ETH_P_FIP)) {