Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes all over. The mini-qdisc bits were a little bit tricky, however. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2396,6 +2396,7 @@ static int lan78xx_reset(struct lan78xx_net *dev)
|
||||
buf = DEFAULT_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
|
||||
dev->rx_urb_size = DEFAULT_BURST_CAP_SIZE;
|
||||
dev->rx_qlen = 4;
|
||||
dev->tx_qlen = 4;
|
||||
}
|
||||
|
||||
ret = lan78xx_write_reg(dev, BURST_CAP, buf);
|
||||
|
Reference in New Issue
Block a user