diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 18:30:44 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:32 -0400 |
commit | 459a98ed881802dee55897441bc7f77af614368e (patch) | |
tree | b81f76632d8f2e21eb91ec3d885091a98398d93e /drivers/isdn/i4l | |
parent | 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (diff) |
[SK_BUFF]: Introduce skb_reset_mac_header(skb)
For the common, open coded 'skb->mac.raw = skb->data' operation, so that we can
later turn skb->mac.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 case, next 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 'drivers/isdn/i4l')
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 4 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 838b3734e2b6..fadb9291bc1b 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1366,7 +1366,7 @@ isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
1366 | struct ethhdr *eth; | 1366 | struct ethhdr *eth; |
1367 | unsigned char *rawp; | 1367 | unsigned char *rawp; |
1368 | 1368 | ||
1369 | skb->mac.raw = skb->data; | 1369 | skb_reset_mac_header(skb); |
1370 | skb_pull(skb, ETH_HLEN); | 1370 | skb_pull(skb, ETH_HLEN); |
1371 | eth = eth_hdr(skb); | 1371 | eth = eth_hdr(skb); |
1372 | 1372 | ||
@@ -1786,7 +1786,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb) | |||
1786 | } | 1786 | } |
1787 | skb->dev = ndev; | 1787 | skb->dev = ndev; |
1788 | skb->pkt_type = PACKET_HOST; | 1788 | skb->pkt_type = PACKET_HOST; |
1789 | skb->mac.raw = skb->data; | 1789 | skb_reset_mac_header(skb); |
1790 | #ifdef ISDN_DEBUG_NET_DUMP | 1790 | #ifdef ISDN_DEBUG_NET_DUMP |
1791 | isdn_dumppkt("R:", skb->data, skb->len, 40); | 1791 | isdn_dumppkt("R:", skb->data, skb->len, 40); |
1792 | #endif | 1792 | #endif |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 1b2df80c3bce..be915051cb2e 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -1167,7 +1167,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff | |||
1167 | mlp->huptimer = 0; | 1167 | mlp->huptimer = 0; |
1168 | #endif /* CONFIG_IPPP_FILTER */ | 1168 | #endif /* CONFIG_IPPP_FILTER */ |
1169 | skb->dev = dev; | 1169 | skb->dev = dev; |
1170 | skb->mac.raw = skb->data; | 1170 | skb_reset_mac_header(skb); |
1171 | netif_rx(skb); | 1171 | netif_rx(skb); |
1172 | /* net_dev->local->stats.rx_packets++; done in isdn_net.c */ | 1172 | /* net_dev->local->stats.rx_packets++; done in isdn_net.c */ |
1173 | return; | 1173 | return; |