View | Details | Raw Unified | Return to bug 42899 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/net/ethernet/realtek/r8169.c (-1 / +16 lines)
Lines 5272-5277 static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, Link Here
5272
	}
5272
	}
5273
5273
5274
	rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
5274
	rtl8169_map_to_asic(desc, mapping, rx_buf_sz);
5275
5276
	netif_info(tp, probe, dev, "mapping: 0x%lx, %p\n", (long)mapping, data);
5277
5275
	return data;
5278
	return data;
5276
5279
5277
err_out:
5280
err_out:
Lines 5529-5534 static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, Link Here
5529
5532
5530
	txd->opts2 = cpu_to_le32(opts[1]);
5533
	txd->opts2 = cpu_to_le32(opts[1]);
5531
5534
5535
	mmiowb();
5532
	wmb();
5536
	wmb();
5533
5537
5534
	/* Anti gcc 2.95.3 bugware (sic) */
5538
	/* Anti gcc 2.95.3 bugware (sic) */
Lines 5676-5682 static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp) Link Here
5676
		if (tp->cur_tx != dirty_tx) {
5680
		if (tp->cur_tx != dirty_tx) {
5677
			void __iomem *ioaddr = tp->mmio_addr;
5681
			void __iomem *ioaddr = tp->mmio_addr;
5678
5682
5683
			/* No kick during the opts1 .. cur_tx update window
5684
			 * in start_xmit.
5685
			 * FIXME: piece of shit. Should use chipset timer irq.
5686
			 */
5687
			netif_tx_lock(dev);
5679
			RTL_W8(TxPoll, NPQ);
5688
			RTL_W8(TxPoll, NPQ);
5689
			netif_tx_unlock(dev);
5680
		}
5690
		}
5681
	}
5691
	}
5682
}
5692
}
Lines 5810-5815 static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) Link Here
5810
5820
5811
	status = rtl_get_events(tp);
5821
	status = rtl_get_events(tp);
5812
	if (status && status != 0xffff) {
5822
	if (status && status != 0xffff) {
5823
		if (status & ~(RTL_EVENT_NAPI | tp->event_slow)) {
5824
			if (net_ratelimit())
5825
				netif_err(tp, intr, tp->dev, "status: %02x\n",
5826
					  status);
5827
		}
5828
5813
		status &= RTL_EVENT_NAPI | tp->event_slow;
5829
		status &= RTL_EVENT_NAPI | tp->event_slow;
5814
		if (status) {
5830
		if (status) {
5815
			handled = 1;
5831
			handled = 1;
5816
- 

Return to bug 42899