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

networking: make skb_push & __skb_push 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_push, __skb_push, skb_push_rcsum };
    @@
    - *(fn(SKB, LEN))
    + *(u8 *)fn(SKB, LEN)

    @@
    expression E, SKB, LEN;
    identifier fn = { skb_push, __skb_push, skb_push_rcsum };
    type T;
    @@
    - E = ((T *)(fn(SKB, LEN)))
    + E = fn(SKB, LEN)

    @@
    expression SKB, LEN;
    identifier fn = { skb_push, __skb_push, skb_push_rcsum };
    @@
    - fn(SKB, LEN)[0]
    + *(u8 *)fn(SKB, LEN)

Note that the last part there converts from push(...)[0] to the
more idiomatic *(u8 *)push(...).

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

drivers/atm/solos-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static int psend(struct atm_vcc *vcc, struct sk_buff *skb) 
		}

	}



	header = (void *)skb_push(skb, sizeof(*header));

	header = skb_push(skb, sizeof(*header));



	/* This does _not_ include the size of the header */

	header->size = cpu_to_le16(pktlen);

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 
		return -ENOMEM;



	/* Prepend skb with frame type */

	*skb_push(skb, 1) = hci_skb_pkt_type(skb);

	*(u8 *)skb_push(skb, 1) = hci_skb_pkt_type(skb);



	switch (hci_skb_pkt_type(skb)) {

	case HCI_COMMAND_PKT:

drivers/firewire/net.c

+3 −5
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static int fwnet_header_create(struct sk_buff *skb, struct net_device *net, 
{

	struct fwnet_header *h;



	h = (struct fwnet_header *)skb_push(skb, sizeof(*h));

	h = skb_push(skb, sizeof(*h));

	put_unaligned_be16(type, &h->h_proto);



	if (net->flags & (IFF_LOOPBACK | IFF_NOARP)) {
@@ -961,16 +961,14 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask) 
	tx_len = ptask->max_payload;

	switch (fwnet_get_hdr_lf(&ptask->hdr)) {

	case RFC2374_HDR_UNFRAG:

		bufhdr = (struct rfc2734_header *)

				skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);

		bufhdr = skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);

		put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);

		break;



	case RFC2374_HDR_FIRSTFRAG:

	case RFC2374_HDR_INTFRAG:

	case RFC2374_HDR_LASTFRAG:

		bufhdr = (struct rfc2734_header *)

				skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);

		bufhdr = skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);

		put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);

		put_unaligned_be32(ptask->hdr.w1, &bufhdr->w1);

		break;

drivers/infiniband/hw/cxgb3/iwch_cm.c

+3 −3
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static void send_mpa_req(struct iwch_ep *ep, struct sk_buff *skb) 
	set_arp_failure_handler(skb, arp_failure_discard);

	skb_reset_transport_header(skb);

	len = skb->len;

	req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));

	req = skb_push(skb, sizeof(*req));

	req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);

	req->wr_lo = htonl(V_WR_TID(ep->hwtid));

	req->len = htonl(len);
@@ -564,7 +564,7 @@ static int send_mpa_reject(struct iwch_ep *ep, const void *pdata, u8 plen) 
	skb->priority = CPL_PRIORITY_DATA;

	set_arp_failure_handler(skb, arp_failure_discard);

	skb_reset_transport_header(skb);

	req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));

	req = skb_push(skb, sizeof(*req));

	req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);

	req->wr_lo = htonl(V_WR_TID(ep->hwtid));

	req->len = htonl(mpalen);
@@ -615,7 +615,7 @@ static int send_mpa_reply(struct iwch_ep *ep, const void *pdata, u8 plen) 
	set_arp_failure_handler(skb, arp_failure_discard);

	skb_reset_transport_header(skb);

	len = skb->len;

	req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));

	req = skb_push(skb, sizeof(*req));

	req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);

	req->wr_lo = htonl(V_WR_TID(ep->hwtid));

	req->len = htonl(len);

drivers/infiniband/hw/cxgb4/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -3751,7 +3751,7 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos) 
	tcp_clear_options(&tmp_opt);

	tcp_parse_options(&init_net, skb, &tmp_opt, 0, NULL);



	req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));

	req = __skb_push(skb, sizeof(*req));

	memset(req, 0, sizeof(*req));

	req->l2info = cpu_to_be16(SYN_INTF_V(intf) |

			 SYN_MAC_IDX_V(RX_MACIDX_G(

CRA Git | Maintained and supported by SUSTech CRA and CCSE