diff --git a/mt76.h b/mt76.h
index 8eef0fae..f4dc4a66 100644
--- a/mt76.h
+++ b/mt76.h
@@ -32,9 +32,6 @@
 #define MT_RX_BUF_SIZE      2048
 #define MT_SKB_HEAD_LEN     128
 
-#define MT_BUF_WITH_OVERHEAD(x) \
-	((x) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
-
 struct mt76_dev;
 struct mt76_wcid;
 
diff --git a/usb.c b/usb.c
index 5081643c..2bfc8214 100644
--- a/usb.c
+++ b/usb.c
@@ -286,7 +286,7 @@ static int
 mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
 		 int nsgs, gfp_t gfp)
 {
-	int i, data_size = SKB_WITH_OVERHEAD(q->buf_size);
+	int i;
 
 	for (i = 0; i < nsgs; i++) {
 		struct page *page;
@@ -299,7 +299,7 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
 
 		page = virt_to_head_page(data);
 		offset = data - page_address(page);
-		sg_set_page(&urb->sg[i], page, data_size, offset);
+		sg_set_page(&urb->sg[i], page, q->buf_size, offset);
 	}
 
 	if (i < nsgs) {
@@ -311,7 +311,7 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
 	}
 
 	urb->num_sgs = max_t(int, i, urb->num_sgs);
-	urb->transfer_buffer_length = urb->num_sgs * data_size;
+	urb->transfer_buffer_length = urb->num_sgs * q->buf_size,
 	sg_init_marker(urb->sg, urb->num_sgs);
 
 	return i ? : -ENOMEM;
@@ -611,12 +611,8 @@ static int mt76u_alloc_rx(struct mt76_dev *dev)
 	if (!q->entry)
 		return -ENOMEM;
 
-	if (dev->usb.sg_en)
-		q->buf_size = MT_BUF_WITH_OVERHEAD(MT_RX_BUF_SIZE);
-	else
-		q->buf_size = PAGE_SIZE;
+	q->buf_size = dev->usb.sg_en ? MT_RX_BUF_SIZE : PAGE_SIZE;
 	q->ndesc = MT_NUM_RX_ENTRIES;
-
 	for (i = 0; i < q->ndesc; i++) {
 		err = mt76u_rx_urb_alloc(dev, &q->entry[i]);
 		if (err < 0)