Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
ethernet
/
eth.c
diff --git
a/kernel/net/ethernet/eth.c
b/kernel/net/ethernet/eth.c
index
9e63f25
..
52dcd41
100644
(file)
--- a/
kernel/net/ethernet/eth.c
+++ b/
kernel/net/ethernet/eth.c
@@
-353,6
+353,7
@@
void ether_setup(struct net_device *dev)
dev->header_ops = ð_header_ops;
dev->type = ARPHRD_ETHER;
dev->hard_header_len = ETH_HLEN;
dev->header_ops = ð_header_ops;
dev->type = ARPHRD_ETHER;
dev->hard_header_len = ETH_HLEN;
+ dev->min_header_len = ETH_HLEN;
dev->mtu = ETH_DATA_LEN;
dev->addr_len = ETH_ALEN;
dev->tx_queue_len = 1000; /* Ethernet wants good queues */
dev->mtu = ETH_DATA_LEN;
dev->addr_len = ETH_ALEN;
dev->tx_queue_len = 1000; /* Ethernet wants good queues */
@@
-436,7
+437,7
@@
struct sk_buff **eth_gro_receive(struct sk_buff **head,
skb_gro_pull(skb, sizeof(*eh));
skb_gro_postpull_rcsum(skb, eh, sizeof(*eh));
skb_gro_pull(skb, sizeof(*eh));
skb_gro_postpull_rcsum(skb, eh, sizeof(*eh));
- pp =
ptype->callbacks.gro_receive(
head, skb);
+ pp =
call_gro_receive(ptype->callbacks.gro_receive,
head, skb);
out_unlock:
rcu_read_unlock();
out_unlock:
rcu_read_unlock();