diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 18:33:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:41 -0400 |
commit | 98e399f82ab3a6d863d1d4a7ea48925cc91c830e (patch) | |
tree | 5f84043aeec1ec27c2e8e6cc25b5d2e6c3d07343 /net/appletalk | |
parent | 31713c333ddbb66d694829082620b69b71c4b09a (diff) |
[SK_BUFF]: Introduce skb_mac_header()
For the places where we need a pointer to the mac header, it is still legal to
touch skb->mac.raw directly if just adding to, subtracting from or setting it
to another layer header.
This one also converts some more cases to skb_reset_mac_header() that my
regex missed as it had no spaces before nor after '=', ugh.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r-- | net/appletalk/ddp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 32b82705b685..934f25993ce8 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
@@ -1484,7 +1484,7 @@ static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev, | |||
1484 | struct packet_type *pt, struct net_device *orig_dev) | 1484 | struct packet_type *pt, struct net_device *orig_dev) |
1485 | { | 1485 | { |
1486 | /* Expand any short form frames */ | 1486 | /* Expand any short form frames */ |
1487 | if (skb->mac.raw[2] == 1) { | 1487 | if (skb_mac_header(skb)[2] == 1) { |
1488 | struct ddpehdr *ddp; | 1488 | struct ddpehdr *ddp; |
1489 | /* Find our address */ | 1489 | /* Find our address */ |
1490 | struct atalk_addr *ap = atalk_find_dev_addr(dev); | 1490 | struct atalk_addr *ap = atalk_find_dev_addr(dev); |
@@ -1510,8 +1510,8 @@ static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev, | |||
1510 | * we write the network numbers ! | 1510 | * we write the network numbers ! |
1511 | */ | 1511 | */ |
1512 | 1512 | ||
1513 | ddp->deh_dnode = skb->mac.raw[0]; /* From physical header */ | 1513 | ddp->deh_dnode = skb_mac_header(skb)[0]; /* From physical header */ |
1514 | ddp->deh_snode = skb->mac.raw[1]; /* From physical header */ | 1514 | ddp->deh_snode = skb_mac_header(skb)[1]; /* From physical header */ |
1515 | 1515 | ||
1516 | ddp->deh_dnet = ap->s_net; /* Network number */ | 1516 | ddp->deh_dnet = ap->s_net; /* Network number */ |
1517 | ddp->deh_snet = ap->s_net; | 1517 | ddp->deh_snet = ap->s_net; |