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

Commit 1170a903 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Disable scatter/gather for NCM"

parents f2b28702 3eecbf4f

drivers/usb/gadget/f_ncm.c

+1 −0
Original line number Diff line number Diff line
@@ -851,6 +851,7 @@ static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
			net = gether_connect(&ncm->port);

			if (IS_ERR(net))

				return PTR_ERR(net);

			gether_enable_sg(&ncm->port, false);

		}



		spin_lock(&ncm->lock);

drivers/usb/gadget/u_ether.c

+13 −1
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ struct eth_dev { 
	enum ifc_state		state;

	struct notifier_block	cpufreq_notifier;

	struct work_struct	cpu_policy_w;



	bool			sg_enabled;

};



/* when sg is enabled, sg_ctx is used to track skb each usb request will
@@ -1050,7 +1052,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb, 
	}



	dev->tx_pkts_rcvd++;

	if (dev->gadget->sg_supported) {

	if (dev->gadget->sg_supported && dev->sg_enabled) {

		skb_queue_tail(&dev->tx_skb_q, skb);

		if (dev->tx_skb_q.qlen > tx_stop_threshold) {

			dev->tx_throttle++;
@@ -1689,6 +1691,13 @@ void gether_update_dl_max_xfer_size(struct gether *link, uint32_t s) 
	spin_unlock_irqrestore(&dev->lock, flags);

}



void gether_enable_sg(struct gether *link, bool enable)

{

	struct eth_dev		*dev = link->ioport;



	dev->sg_enabled = enable;

}



void gether_update_dl_max_pkts_per_xfer(struct gether *link, uint32_t n)

{

	struct eth_dev		*dev = link->ioport;
@@ -1740,6 +1749,9 @@ struct net_device *gether_connect(struct gether *link) 
		}

	}



	/* function driver may later disable sg support */

	dev->sg_enabled = dev->gadget->sg_supported;



	link->in_ep->driver_data = dev;

	result = usb_ep_enable(link->in_ep);

	if (result != 0) {

drivers/usb/gadget/u_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ void gether_disconnect(struct gether *); 
int gether_up(struct gether *);

void gether_update_dl_max_pkts_per_xfer(struct gether *link, uint32_t n);

void gether_update_dl_max_xfer_size(struct gether *link, uint32_t s);

void gether_enable_sg(struct gether *link, bool);



/* Some controllers can't support CDC Ethernet (ECM) ... */

static inline bool can_support_ecm(struct usb_gadget *gadget)