summaryrefslogtreecommitdiff
path: root/net/packet/Makefile
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2017-02-04 20:02:49 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-07 10:34:42 -0500
commit55601a880690cdeccdb5923c2493f0e3736f8f6b (patch)
tree9fffd9900080683df7902922121a1e26ac403878 /net/packet/Makefile
parent108d9c71dcff8fc2523861b3462ab2ba8a754ed9 (diff)
net: phy: Add 2000base-x, 2500base-x and rxaui modes
The mv88e6390 ports 9 and 10 supports some additional PHY modes. Add these modes to the PHY core so they can be used in the binding. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet/Makefile')
0 files changed, 0 insertions, 0 deletions
a>)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: - use-after-free in algif_aead - modular aesni regression when pcbc is modular but absent - bug causing IO page faults in ccp - double list add in ccp - NULL pointer dereference in qat (two patches) - panic in chcr - NULL pointer dereference in chcr - out-of-bound access in chcr * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: chcr - Fix key length for RFC4106 crypto: algif_aead - Fix kernel panic on list_del crypto: aesni - Fix failure when pcbc module is absent crypto: ccp - Fix double add when creating new DMA command crypto: ccp - Fix DMA operations when IOMMU is enabled crypto: chcr - Check device is allocated before use crypto: chcr - Fix panic on dma_unmap_sg crypto: qat - zero esram only for DH85x devices crypto: qat - fix bar discovery for c62x
Diffstat (limited to 'net/ipv4/gre_offload.c')