"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "drivers/net/ethernet/realtek/r8169_main.c" between
linux-5.3-rc3.tar.gz and linux-5.3-rc4.tar.gz

About: The full source of the development Linux kernel 5.3 (release candidate).

r8169_main.c  (linux-5.3-rc3):r8169_main.c  (linux-5.3-rc4)
skipping to change at line 6138 skipping to change at line 6138
int ret; int ret;
phy_mode = tp->supports_gmii ? PHY_INTERFACE_MODE_GMII : phy_mode = tp->supports_gmii ? PHY_INTERFACE_MODE_GMII :
PHY_INTERFACE_MODE_MII; PHY_INTERFACE_MODE_MII;
ret = phy_connect_direct(tp->dev, phydev, r8169_phylink_handler, ret = phy_connect_direct(tp->dev, phydev, r8169_phylink_handler,
phy_mode); phy_mode);
if (ret) if (ret)
return ret; return ret;
if (tp->supports_gmii) if (!tp->supports_gmii)
phy_remove_link_mode(phydev,
ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
else
phy_set_max_speed(phydev, SPEED_100); phy_set_max_speed(phydev, SPEED_100);
phy_support_asym_pause(phydev); phy_support_asym_pause(phydev);
phy_attached_info(phydev); phy_attached_info(phydev);
return 0; return 0;
} }
static void rtl8169_down(struct net_device *dev) static void rtl8169_down(struct net_device *dev)
skipping to change at line 6591 skipping to change at line 6588
/* special workaround needed */ /* special workaround needed */
tp->irq_mask |= RxFIFOOver; tp->irq_mask |= RxFIFOOver;
else else
tp->irq_mask |= RxOverflow; tp->irq_mask |= RxOverflow;
} }
static int rtl_alloc_irq(struct rtl8169_private *tp) static int rtl_alloc_irq(struct rtl8169_private *tp)
{ {
unsigned int flags; unsigned int flags;
if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
rtl_unlock_config_regs(tp); rtl_unlock_config_regs(tp);
RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable);
rtl_lock_config_regs(tp); rtl_lock_config_regs(tp);
/* fall through */
case RTL_GIGA_MAC_VER_07 ... RTL_GIGA_MAC_VER_24:
flags = PCI_IRQ_LEGACY; flags = PCI_IRQ_LEGACY;
} else { break;
default:
flags = PCI_IRQ_ALL_TYPES; flags = PCI_IRQ_ALL_TYPES;
break;
} }
return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags); return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
} }
static void rtl_read_mac_address(struct rtl8169_private *tp, static void rtl_read_mac_address(struct rtl8169_private *tp,
u8 mac_addr[ETH_ALEN]) u8 mac_addr[ETH_ALEN])
{ {
/* Get MAC address */ /* Get MAC address */
if (rtl_is_8168evl_up(tp) && tp->mac_version != RTL_GIGA_MAC_VER_34) { if (rtl_is_8168evl_up(tp) && tp->mac_version != RTL_GIGA_MAC_VER_34) {
 End of changes. 5 change blocks. 
6 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)