diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 08:57:13 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:26 -0400 |
commit | 0a4f23fbbff70c268b0f2f5e0b87301c132fb305 (patch) | |
tree | 7de3a6bef26eb360e47d77dcf99c2275d1475f40 /net/802 | |
parent | c8fb7948dc1aeff0515b2912b564d4236f6c0ebd (diff) |
[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.c | 1 | ||||
-rw-r--r-- | net/802/hippi.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c index 8c86216b1c85..f8a0c9f6fec9 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) | |||
130 | * to start of packet data. Assume 802.2 SNAP frames for now. | 130 | * to start of packet data. Assume 802.2 SNAP frames for now. |
131 | */ | 131 | */ |
132 | 132 | ||
133 | skb->dev = dev; | ||
133 | skb->mac.raw = skb->data; /* point to frame control (FC) */ | 134 | skb->mac.raw = skb->data; /* point to frame control (FC) */ |
134 | 135 | ||
135 | if(fddi->hdr.llc_8022_1.dsap==0xe0) | 136 | if(fddi->hdr.llc_8022_1.dsap==0xe0) |
diff --git a/net/802/hippi.c b/net/802/hippi.c index 35dd938cff95..138302c14ee6 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) | |||
126 | { | 126 | { |
127 | struct hippi_hdr *hip; | 127 | struct hippi_hdr *hip; |
128 | 128 | ||
129 | hip = (struct hippi_hdr *) skb->data; | ||
130 | |||
131 | /* | 129 | /* |
132 | * This is actually wrong ... question is if we really should | 130 | * This is actually wrong ... question is if we really should |
133 | * set the raw address here. | 131 | * set the raw address here. |
134 | */ | 132 | */ |
135 | skb->mac.raw = skb->data; | 133 | skb->dev = dev; |
136 | skb_pull(skb, HIPPI_HLEN); | 134 | skb->mac.raw = skb->data; |
135 | hip = (struct hippi_hdr *)skb->mac.raw; | ||
136 | skb_pull(skb, HIPPI_HLEN); | ||
137 | 137 | ||
138 | /* | 138 | /* |
139 | * No fancy promisc stuff here now. | 139 | * No fancy promisc stuff here now. |