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

Commit fca7d6cd authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable USB to Ethernet driver lan78xx on HDK8150"

parents f63f1713 53afa03f

arch/arm64/configs/vendor/sm8150-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ CONFIG_NET_CLS_ACT=y 
CONFIG_NET_ACT_GACT=y

CONFIG_NET_ACT_MIRRED=y

CONFIG_NET_ACT_SKBEDIT=y

CONFIG_NET_SWITCHDEV=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y
@@ -306,6 +307,7 @@ CONFIG_PPPOLAC=y 
CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_LAN78XX=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_WCNSS_MEM_PRE_ALLOC=y

arch/arm64/configs/vendor/sm8150_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ CONFIG_NET_ACT_GACT=y 
CONFIG_NET_ACT_MIRRED=y

CONFIG_NET_ACT_SKBEDIT=y

CONFIG_DNS_RESOLVER=y

CONFIG_NET_SWITCHDEV=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y
@@ -317,6 +318,7 @@ CONFIG_PPPOLAC=y 
CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_LAN78XX=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_WCNSS_MEM_PRE_ALLOC=y

drivers/net/usb/lan78xx.c

+6 −3
Original line number Diff line number Diff line
@@ -2210,6 +2210,10 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) 
	ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo);

	ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi);



	/* Added to support MAC address changes */

	ret = lan78xx_write_reg(dev, MAF_LO(0), addr_lo);

	ret = lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_);



	return 0;

}
@@ -3188,9 +3192,9 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) 
	count = 0;

	length = 0;

	spin_lock_irqsave(&tqp->lock, flags);

	for (skb = tqp->next; pkt_cnt < tqp->qlen; skb = skb->next) {

	skb_queue_walk(tqp, skb) {

		if (skb_is_gso(skb)) {

			if (pkt_cnt) {

			if (!skb_queue_is_first(tqp, skb)) {

				/* handle previous packets first */

				break;

			}
@@ -3601,7 +3605,6 @@ static int lan78xx_probe(struct usb_interface *intf, 
	ret = lan78xx_bind(dev, intf);

	if (ret < 0)

		goto out2;

	strcpy(netdev->name, "eth%d");



	if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len))

		netdev->mtu = dev->hard_mtu - netdev->hard_header_len;