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

Commit b0e380b1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: unions of just one member don't get anything done, kill them 



Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and
skb->mac to skb->mac_header, to match the names of the associated helpers
(skb[_[re]set]_{transport,network,mac}_header).

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfe1fc77

drivers/net/arcnet/arcnet.c

+11 −6
Original line number Diff line number Diff line
@@ -519,9 +519,12 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev, 
		 * real header when we do rebuild_header.

		 */

		*(uint16_t *) skb_push(skb, 2) = type;

		if (skb->nh.raw - skb->mac.raw != 2)

		/*

		 * XXX: Why not use skb->mac_len?

		 */

		if (skb->network_header - skb->mac_header != 2)

			BUGMSG(D_NORMAL, "arcnet_header: Yikes!  diff (%d) is not 2!\n",

			       (int)(skb->nh.raw - skb->mac.raw));

			       (int)(skb->network_header - skb->mac_header));

		return -2;	/* return error -- can't transmit yet! */

	}

	else {
@@ -554,11 +557,13 @@ static int arcnet_rebuild_header(struct sk_buff *skb) 
	unsigned short type;

	uint8_t daddr=0;

	struct ArcProto *proto;



	if (skb->nh.raw - skb->mac.raw != 2) {

	/*

	 * XXX: Why not use skb->mac_len?

	 */

	if (skb->network_header - skb->mac_header != 2) {

		BUGMSG(D_NORMAL,

		       "rebuild_header: shouldn't be here! (hdrsize=%d)\n",

		     (int)(skb->nh.raw - skb->mac.raw));

		       (int)(skb->network_header - skb->mac_header));

		return 0;

	}

	type = *(uint16_t *) skb_pull(skb, 2);

drivers/net/bonding/bond_3ad.c

+2 −2
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int ad_lacpdu_send(struct port *port) 


	skb->dev = slave->dev;

	skb_reset_mac_header(skb);

	skb->nh.raw = skb->mac.raw + ETH_HLEN;

	skb->network_header = skb->mac_header + ETH_HLEN;

	skb->protocol = PKT_TYPE_LACPDU;

	skb->priority = TC_PRIO_CONTROL;
@@ -929,7 +929,7 @@ static int ad_marker_send(struct port *port, struct marker *marker) 


	skb->dev = slave->dev;

	skb_reset_mac_header(skb);

	skb->nh.raw = skb->mac.raw + ETH_HLEN;

	skb->network_header = skb->mac_header + ETH_HLEN;

	skb->protocol = PKT_TYPE_LACPDU;



	marker_header = (struct marker_header *)skb_put(skb, length);

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]) 
		memcpy(data, &pkt, size);



		skb_reset_mac_header(skb);

		skb->nh.raw = skb->mac.raw + ETH_HLEN;

		skb->network_header = skb->mac_header + ETH_HLEN;

		skb->protocol = pkt.type;

		skb->priority = TC_PRIO_CONTROL;

		skb->dev = slave->dev;

drivers/net/wireless/hostap/hostap_80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
		skb2->protocol = __constant_htons(ETH_P_802_3);

		skb_reset_mac_header(skb2);

		skb_reset_network_header(skb2);

		/* skb2->nh.raw += ETH_HLEN; */

		/* skb2->network_header += ETH_HLEN; */

		dev_queue_xmit(skb2);

	}

include/linux/if_vlan.h

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, unsigned short 
	veth->h_vlan_TCI = htons(tag);



	skb->protocol = __constant_htons(ETH_P_8021Q);

	skb->mac.raw -= VLAN_HLEN;

	skb->nh.raw -= VLAN_HLEN;

	skb->mac_header -= VLAN_HLEN;

	skb->network_header -= VLAN_HLEN;



	return skb;

}