diff options
| author | Jason Gunthorpe <[email protected]> | 2023-10-31 13:54:48 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <[email protected]> | 2023-10-31 13:54:48 +0000 |
| commit | 162e3480246ef69386d4647d2320d86741bf08a2 (patch) | |
| tree | caada42ce40114e7abe5e74acb54781ad4aa424a /drivers/net/xen-netback/interface.c | |
| parent | RDMA/hfi1: Workaround truncation compilation error (diff) | |
| parent | Linux 6.6 (diff) | |
| download | kernel-162e3480246ef69386d4647d2320d86741bf08a2.tar.gz kernel-162e3480246ef69386d4647d2320d86741bf08a2.zip | |
Merge tag 'v6.6' into rdma.git for-next
Resolve conflict by taking the spin_lock hunk from for-next:
https://lore.kernel.org/r/[email protected]
Required for the next patch.
Signed-off-by: Jason Gunthorpe <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index f3f2c07423a6..fc3bb63b9ac3 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -41,8 +41,6 @@ #include <asm/xen/hypercall.h> #include <xen/balloon.h> -#define XENVIF_QUEUE_LENGTH 32 - /* Number of bytes allowed on the internal guest Rx queue. */ #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE) @@ -530,8 +528,6 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, dev->features = dev->hw_features | NETIF_F_RXCSUM; dev->ethtool_ops = &xenvif_ethtool_ops; - dev->tx_queue_len = XENVIF_QUEUE_LENGTH; - dev->min_mtu = ETH_MIN_MTU; dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN; |