mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 01:33:00 -04:00
[SK_BUFF]: Introduce skb_reset_transport_header(skb)
For the common, open coded 'skb->h.raw = skb->data' operation, so that we can
later turn skb->h.raw into a offset, reducing the size of struct sk_buff in
64bit land while possibly keeping it as a pointer on 32bit.
This one touches just the most simple cases:
skb->h.raw = skb->data;
skb->h.raw = {skb_push|[__]skb_pull}()
The next ones will handle the slightly more "complex" cases.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
0660e03f6b
commit
badff6d01a
49 changed files with 82 additions and 73 deletions
|
|
@ -1631,8 +1631,8 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
|
|||
if (!ax25_sk(sk)->pidincl)
|
||||
skb_pull(skb, 1); /* Remove PID */
|
||||
|
||||
skb->h.raw = skb->data;
|
||||
copied = skb->len;
|
||||
skb_reset_transport_header(skb);
|
||||
copied = skb->len;
|
||||
|
||||
if (copied > size) {
|
||||
copied = size;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb)
|
|||
|
||||
skbn->dev = ax25->ax25_dev->dev;
|
||||
skb_reset_network_header(skbn);
|
||||
skbn->h.raw = skbn->data;
|
||||
skb_reset_transport_header(skbn);
|
||||
|
||||
/* Copy data from the fragments */
|
||||
while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) {
|
||||
|
|
@ -196,7 +196,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
* Process the AX.25/LAPB frame.
|
||||
*/
|
||||
|
||||
skb->h.raw = skb->data;
|
||||
skb_reset_transport_header(skb);
|
||||
|
||||
if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) {
|
||||
kfree_skb(skb);
|
||||
|
|
@ -246,7 +246,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
switch (skb->data[1]) {
|
||||
case AX25_P_IP:
|
||||
skb_pull(skb,2); /* drop PID/CTRL */
|
||||
skb->h.raw = skb->data;
|
||||
skb_reset_transport_header(skb);
|
||||
skb_reset_network_header(skb);
|
||||
skb->dev = dev;
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
|
@ -256,7 +256,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||
|
||||
case AX25_P_ARP:
|
||||
skb_pull(skb,2);
|
||||
skb->h.raw = skb->data;
|
||||
skb_reset_transport_header(skb);
|
||||
skb_reset_network_header(skb);
|
||||
skb->dev = dev;
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
|
|
|||
Loading…
Reference in a new issue