aboutsummaryrefslogtreecommitdiffstats
path: root/net/netrom/af_netrom.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-13 12:06:52 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:25:15 -0400
commitbadff6d01a8589a1c828b0bf118903ca38627f4e (patch)
tree89611d7058c612085c58dfb9913ee30ddf04b604 /net/netrom/af_netrom.c
parent0660e03f6b18f19b6bbafe7583265a51b90daf36 (diff)
[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 <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r--net/netrom/af_netrom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index a54e7ef2568..8d0f30a015d 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -878,7 +878,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
878 if (frametype == NR_PROTOEXT && 878 if (frametype == NR_PROTOEXT &&
879 circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) { 879 circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) {
880 skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN); 880 skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN);
881 skb->h.raw = skb->data; 881 skb_reset_transport_header(skb);
882 882
883 return nr_rx_ip(skb, dev); 883 return nr_rx_ip(skb, dev);
884 } 884 }
@@ -904,7 +904,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
904 } 904 }
905 905
906 if (sk != NULL) { 906 if (sk != NULL) {
907 skb->h.raw = skb->data; 907 skb_reset_transport_header(skb);
908 908
909 if (frametype == NR_CONNACK && skb->len == 22) 909 if (frametype == NR_CONNACK && skb->len == 22)
910 nr_sk(sk)->bpqext = 1; 910 nr_sk(sk)->bpqext = 1;
@@ -1149,7 +1149,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
1149 return er; 1149 return er;
1150 } 1150 }
1151 1151
1152 skb->h.raw = skb->data; 1152 skb_reset_transport_header(skb);
1153 copied = skb->len; 1153 copied = skb->len;
1154 1154
1155 if (copied > size) { 1155 if (copied > size) {