Merge pull request torvalds#331 from mad-ady/odroidxu4-4.14.y

Netconsole support for XU4's network card
tobetter · Dec 17, 2017 · a98b3e4 · a98b3e4
2 parents 0d057e0 + 7f7aab3
commit a98b3e4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
@@ -4974,6 +4974,10 @@ static int rtl8152_change_mtu(struct net_device *dev, int new_mtu)
 	return ret;
 }
 
+static void rtl8152_fake_poll(struct net_device *netdev)
+{
+}
+
 static const struct net_device_ops rtl8152_netdev_ops = {
 	.ndo_open		= rtl8152_open,
 	.ndo_stop		= rtl8152_close,
@@ -4986,6 +4990,9 @@ static const struct net_device_ops rtl8152_netdev_ops = {
 	.ndo_change_mtu		= rtl8152_change_mtu,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_features_check	= rtl8152_features_check,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller = rtl8152_fake_poll,
+#endif
 };
 
 static void rtl8152_unload(struct r8152 *tp)