Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a4f23fb authored Mar 10, 2007 by Arnaldo Carvalho de Melo Committed by David S. Miller Apr 25, 2007

[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>

parent c8fb7948

drivers/net/defxx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3096,8 +3096,6 @@ static void dfx_rcv_queue_process(

		skb_reserve(skb,3); /* adjust data field so that it points to FC byte */
		skb_put(skb, pkt_len); /* pass up packet length, NOT including CRC */
		skb->dev = bp->dev; /* pass up device pointer */

		skb->protocol = fddi_type_trans(skb, bp->dev);
		bp->rcv_total_bytes += skb->len;
		netif_rx(skb);

drivers/net/rrunner.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,6 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
		goto defer;
		}
		}
		skb->dev = dev;
		skb->protocol = hippi_type_trans(skb, dev);

		netif_rx(skb); /* send it up */

drivers/net/skfp/skfddi.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1680,7 +1680,6 @@ void mac_drv_rx_complete(struct s_smc smc, volatile struct s_smt_fp_rxd rxd,
		rxd->rxd_os.skb = NULL;
		skb_trim(skb, len);
		skb->protocol = fddi_type_trans(skb, bp->dev);
		skb->dev = bp->dev; /* pass up device pointer */

		netif_rx(skb);
		bp->dev->last_rx = jiffies;

drivers/s390/net/lcs.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1784,7 +1784,6 @@ lcs_get_skb(struct lcs_card card, char skb_data, unsigned int skb_len)
		card->stats.rx_dropped++;
		return;
		}
		skb->dev = card->dev;
		memcpy(skb_put(skb, skb_len), skb_data, skb_len);
		skb->protocol = card->lan_type_trans(skb, card->dev);
		card->stats.rx_bytes += skb_len;

net/802/fddi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)