diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-03-11 16:15:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-11 16:15:29 -0400 |
| commit | 9d79b3c7aae582df9eebcea8797c41cd5d5fc39c (patch) | |
| tree | e9fb63376f0a9993728f1e38b9fd7a9dc7a9faa8 /net/core/skbuff.c | |
| parent | vmxnet3: fix netpoll race condition (diff) | |
| parent | stmmac: dwmac-sti: fix broken STiD127 compatibility (diff) | |
| download | linux-dev-9d79b3c7aae582df9eebcea8797c41cd5d5fc39c.tar.xz linux-dev-9d79b3c7aae582df9eebcea8797c41cd5d5fc39c.zip | |
Merge branch 'stmmac'
Giuseppe Cavallaro says:
====================
stmmac fixes: EEE and chained mode
These patches are to fix some new problems in the STMMAC driver.
Mandatory changes are for EEE that needs to be disabled if not supported
and for the chain mode that is broken and the kernel panics if this mode
is enabled.
v3: removed a patch from my previous set that touched the stmmac_tx path
that has not to be applied. Other patches for cleaning-up will be
sent on top of net-next git repo.
v4: do not surround the defaul buffer selection using Koption and adopt
a default to 1536bytes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skbuff.c')
0 files changed, 0 insertions, 0 deletions