From 0a4f23fbbff70c268b0f2f5e0b87301c132fb305 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Sat, 10 Mar 2007 10:57:13 -0300 Subject: [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 Signed-off-by: David S. Miller --- net/802/fddi.c | 1 + net/802/hippi.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'net') 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) * 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 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) { 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. -- cgit v1.2.2