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

Commit c8fb7948 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[TR]: Make tr_type_trans set skb->dev 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1a4b86e

drivers/net/tokenring/3c359.c

+0 −4
Original line number Diff line number Diff line
@@ -933,8 +933,6 @@ static void xl_rx(struct net_device *dev) 
				return ; 				

			}

	

			skb->dev = dev ; 



			while (xl_priv->rx_ring_tail != temp_ring_loc) { 

				copy_len = xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen & 0x7FFF ; 

				frame_length -= copy_len ;
@@ -967,8 +965,6 @@ static void xl_rx(struct net_device *dev) 
				return ; 

			}



			skb->dev = dev ; 



			skb2 = xl_priv->rx_ring_skb[xl_priv->rx_ring_tail] ; 

			pci_unmap_single(xl_priv->pdev, xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr, xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ; 

			skb_put(skb2, frame_length) ;

drivers/net/tokenring/ibmtr.c

+0 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,6 @@ static void tr_rx(struct net_device *dev) 
	/*BMS again, if she comes in with few but leaves with many */

	skb_reserve(skb, sizeof(struct trh_hdr) - lan_hdr_len);

	skb_put(skb, length);

	skb->dev = dev;

	data = skb->data;

	rbuffer_len = ntohs(readw(rbuf + offsetof(struct rec_buf, buf_len)));

	rbufdata = rbuf + offsetof(struct rec_buf, data);

drivers/net/tokenring/lanstreamer.c

+0 −3
Original line number Diff line number Diff line
@@ -944,8 +944,6 @@ static void streamer_rx(struct net_device *dev) 
				printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",	dev->name);

				streamer_priv->streamer_stats.rx_dropped++;

			} else {	/* we allocated an skb OK */

				skb->dev = dev;



				if (buffer_cnt == 1) {

					/* release the DMA mapping */

					pci_unmap_single(streamer_priv->pci_dev,
@@ -1607,7 +1605,6 @@ static void streamer_arb_cmd(struct net_device *dev) 
				      frame_data, buffer_len);

		} while (next_ptr && (buff_off = next_ptr));



		mac_frame->dev = dev;

		mac_frame->protocol = tr_type_trans(mac_frame, dev);

#if STREAMER_NETWORK_MONITOR

		printk(KERN_WARNING "%s: Received MAC Frame, details: \n",

drivers/net/tokenring/olympic.c

+0 −3
Original line number Diff line number Diff line
@@ -814,8 +814,6 @@ static void olympic_rx(struct net_device *dev) 
					olympic_priv->rx_ring_last_received += i ; 

					olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ;  

				} else  {

					skb->dev = dev ; 



					/* Optimise based upon number of buffers used. 

			   	   	   If only one buffer is used we can simply swap the buffers around.

			   	   	   If more than one then we must use the new buffer and copy the information
@@ -1440,7 +1438,6 @@ static void olympic_arb_cmd(struct net_device *dev) 
			next_ptr=readw(buf_ptr+offsetof(struct mac_receive_buffer,next)); 

		} while (next_ptr && (buf_ptr=olympic_priv->olympic_lap + ntohs(next_ptr)));



		mac_frame->dev = dev;

		mac_frame->protocol = tr_type_trans(mac_frame, dev);



		if (olympic_priv->olympic_network_monitor) {

drivers/net/tokenring/smctr.c

+0 −2
Original line number Diff line number Diff line
@@ -3896,7 +3896,6 @@ static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size, 
                tp->MacStat.rx_bytes += skb->len;



                /* Kick the packet on up. */

                skb->dev = dev;

                skb->protocol = tr_type_trans(skb, dev);

                netif_rx(skb);

		dev->last_rx = jiffies;
@@ -4483,7 +4482,6 @@ static int smctr_rx_frame(struct net_device *dev) 
                                	tp->MacStat.rx_bytes += skb->len;



                                	/* Kick the packet on up. */

                                	skb->dev = dev;

                                	skb->protocol = tr_type_trans(skb, dev);

                                	netif_rx(skb);

					dev->last_rx = jiffies;