projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.7/dax' into libnvdimm-for-next
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
i40e
/
i40e_txrx.h
diff --git
a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index cdd5dc00aec519972dd3af6166666a0d3c65766f..a9bd70537d6547b550a591b7775a8fcf4c76f186 100644
(file)
--- a/
drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/
drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@
-413,10
+413,14
@@
static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)
**/
static inline bool i40e_chk_linearize(struct sk_buff *skb, int count)
{
**/
static inline bool i40e_chk_linearize(struct sk_buff *skb, int count)
{
- /*
we can only support up to 8 data buffers for a single send
*/
- if (likely(count <
=
I40E_MAX_BUFFER_TXD))
+ /*
Both TSO and single send will work if count is less than 8
*/
+ if (likely(count < I40E_MAX_BUFFER_TXD))
return false;
return false;
- return __i40e_chk_linearize(skb);
+ if (skb_is_gso(skb))
+ return __i40e_chk_linearize(skb);
+
+ /* we can support up to 8 data buffers for a single send */
+ return count != I40E_MAX_BUFFER_TXD;
}
#endif /* _I40E_TXRX_H_ */
}
#endif /* _I40E_TXRX_H_ */
This page took
0.029893 seconds
and
5
git commands to generate.