aboutsummaryrefslogtreecommitdiff
path: root/net/802
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 10:57:13 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:24:26 -0700
commit0a4f23fbbff70c268b0f2f5e0b87301c132fb305 (patch)
tree7de3a6bef26eb360e47d77dcf99c2275d1475f40 /net/802
parentc8fb7948dc1aeff0515b2912b564d4236f6c0ebd (diff)
downloadlinux-0a4f23fbbff70c268b0f2f5e0b87301c132fb305.tar.gz
[HIPPI/FDDI]: Make {hippi,fddi}_type_trans set skb->dev
Now all the _type_trans routines are consistent in this regard. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/802')
-rw-r--r--net/802/fddi.c1
-rw-r--r--net/802/hippi.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c
index 8c86216b1c8..f8a0c9f6fec 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -130,6 +130,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
* to start of packet data. Assume 802.2 SNAP frames for now.
*/
+ skb->dev = dev;
skb->mac.raw = skb->data; /* point to frame control (FC) */
if(fddi->hdr.llc_8022_1.dsap==0xe0)
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 35dd938cff9..138302c14ee 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -126,14 +126,14 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct hippi_hdr *hip;
- hip = (struct hippi_hdr *) skb->data;
-
/*
* This is actually wrong ... question is if we really should
* set the raw address here.
*/
- skb->mac.raw = skb->data;
- skb_pull(skb, HIPPI_HLEN);
+ skb->dev = dev;
+ skb->mac.raw = skb->data;
+ hip = (struct hippi_hdr *)skb->mac.raw;
+ skb_pull(skb, HIPPI_HLEN);
/*
* No fancy promisc stuff here now.