projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f3ebb0
)
net: ethernet: cadence: fix socket buffer corruption problem
author
Tristram Ha
<
[email protected]
>
Wed, 24 Oct 2018 21:51:23 +0000
(14:51 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 25 Oct 2018 18:32:24 +0000
(11:32 -0700)
Socket buffer is not re-created when headroom is 2 and tailroom is 1.
Signed-off-by: Tristram Ha <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/cadence/macb_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/cadence/macb_main.c
b/drivers/net/ethernet/cadence/macb_main.c
index 8f5bf9166c11a39d1408eb50df952415ce824738..1d86b4d5645ad884b34103a45eb42c7af95f0745 100644
(file)
--- a/
drivers/net/ethernet/cadence/macb_main.c
+++ b/
drivers/net/ethernet/cadence/macb_main.c
@@
-1684,7
+1684,7
@@
static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
padlen = 0;
/* No room for FCS, need to reallocate skb. */
else
- padlen = ETH_FCS_LEN
- tailroom
;
+ padlen = ETH_FCS_LEN;
} else {
/* Add room for FCS. */
padlen += ETH_FCS_LEN;