|
@@ -5023,7 +5023,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
|
|
if (skb->data_len && (hdr_len == len)) {
|
|
if (skb->data_len && (hdr_len == len)) {
|
|
unsigned int pull_size;
|
|
unsigned int pull_size;
|
|
|
|
|
|
- pull_size = min((unsigned int)4, skb->data_len);
|
|
|
|
|
|
+ pull_size = min_t(unsigned int, 4, skb->data_len);
|
|
if (!__pskb_pull_tail(skb, pull_size)) {
|
|
if (!__pskb_pull_tail(skb, pull_size)) {
|
|
e_err("__pskb_pull_tail failed.\n");
|
|
e_err("__pskb_pull_tail failed.\n");
|
|
dev_kfree_skb_any(skb);
|
|
dev_kfree_skb_any(skb);
|