diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-13 18:02:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-13 18:02:49 -0400 |
commit | 87e067cda6df60b55cea0239c2f3cee81e9f46df (patch) | |
tree | 3e8575e2c828f437ac0fbf9e65555218dee9e3c9 /net/ipv4/sysctl_net_ipv4.c | |
parent | Merge branch 'tcp-fastopen-ipv6' (diff) | |
parent | arc_emac: add netpoll support (diff) | |
download | linux-dev-87e067cda6df60b55cea0239c2f3cee81e9f46df.tar.xz linux-dev-87e067cda6df60b55cea0239c2f3cee81e9f46df.zip |
Merge branch 'arc_emac-next'
Beniamino Galvani says:
====================
arc_emac: promiscuous/multicast mode and netpoll support
These patches add support for promiscuous mode, multicast filtering
and netpoll to the ARC EMAC driver.
They were both tested on a Radxa Rock board which uses a ARC EMAC IP
core integrated in the Rockchip RK3188 SoC.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
0 files changed, 0 insertions, 0 deletions