Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add the opnfv kernel config file"
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
norm_desc.c
diff --git
a/kernel/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
b/kernel/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index
35ad4f4
..
48c3456
100644
(file)
--- a/
kernel/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/
kernel/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@
-123,6
+123,7
@@
static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
int end)
{
static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
int end)
{
+ p->des01.all_flags = 0;
p->des01.rx.own = 1;
p->des01.rx.buffer1_size = BUF_SIZE_2KiB - 1;
p->des01.rx.own = 1;
p->des01.rx.buffer1_size = BUF_SIZE_2KiB - 1;
@@
-137,7
+138,7
@@
static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
static void ndesc_init_tx_desc(struct dma_desc *p, int mode, int end)
{
static void ndesc_init_tx_desc(struct dma_desc *p, int mode, int end)
{
- p->des01.
tx.own
= 0;
+ p->des01.
all_flags
= 0;
if (mode == STMMAC_CHAIN_MODE)
ndesc_tx_set_on_chain(p, end);
else
if (mode == STMMAC_CHAIN_MODE)
ndesc_tx_set_on_chain(p, end);
else