|
@@ -707,6 +707,13 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
|
|
|
void *data;
|
|
|
u32 act;
|
|
|
|
|
|
+ /* Transient failure which in theory could occur if
|
|
|
+ * in-flight packets from before XDP was enabled reach
|
|
|
+ * the receive path after XDP is loaded.
|
|
|
+ */
|
|
|
+ if (unlikely(hdr->hdr.gso_type))
|
|
|
+ goto err_xdp;
|
|
|
+
|
|
|
/* This happens when rx buffer size is underestimated
|
|
|
* or headroom is not enough because of the buffer
|
|
|
* was refilled before XDP is set. This should only
|
|
@@ -727,14 +734,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
|
|
|
xdp_page = page;
|
|
|
}
|
|
|
|
|
|
- /* Transient failure which in theory could occur if
|
|
|
- * in-flight packets from before XDP was enabled reach
|
|
|
- * the receive path after XDP is loaded. In practice I
|
|
|
- * was not able to create this condition.
|
|
|
- */
|
|
|
- if (unlikely(hdr->hdr.gso_type))
|
|
|
- goto err_xdp;
|
|
|
-
|
|
|
/* Allow consuming headroom but reserve enough space to push
|
|
|
* the descriptor on if we get an XDP_TX return code.
|
|
|
*/
|