bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return NETDEV_TX_BUSY if unable to transmit.

This commit is contained in:
Florian Pose 2021-07-20 16:58:40 +02:00
parent 246fc6e07a
commit 8ba04f4e26
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devices/e1000e/netdev-5.4-ethercat.c
View File

@ -5914,20 +5914,20 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
if (test_bit(__E1000_DOWN, &adapter->state)) { if (test_bit(__E1000_DOWN, &adapter->state)) {
if (!adapter->ecdev) if (!adapter->ecdev)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NETDEV_TX_OK; return NETDEV_TX_BUSY;
} }
if (skb->len <= 0) { if (skb->len <= 0) {
if (!adapter->ecdev) if (!adapter->ecdev)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NETDEV_TX_OK; return NETDEV_TX_BUSY;
} }
/* The minimum packet size with TCTL.PSP set is 17 bytes so /* The minimum packet size with TCTL.PSP set is 17 bytes so
* pad skb in order to meet this minimum size requirement * pad skb in order to meet this minimum size requirement
*/ */
if (skb_put_padto(skb, 17)) if (skb_put_padto(skb, 17))
return NETDEV_TX_OK; return NETDEV_TX_BUSY;
mss = skb_shinfo(skb)->gso_size; mss = skb_shinfo(skb)->gso_size;
if (mss) { if (mss) {
@ -5949,7 +5949,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
e_err("__pskb_pull_tail failed.\n"); e_err("__pskb_pull_tail failed.\n");
if (!adapter->ecdev) if (!adapter->ecdev)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NETDEV_TX_OK; return NETDEV_TX_BUSY;
} }
len = skb_headlen(skb); len = skb_headlen(skb);
} }
@ -5988,7 +5988,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
if (tso < 0) { if (tso < 0) {
if (!adapter->ecdev) if (!adapter->ecdev)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return NETDEV_TX_OK; return NETDEV_TX_BUSY;
} }
if (tso) if (tso)