• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6bc19fb8
    David S. Miller authored
    Merge 'net' bug fixes into 'net-next' as we have patches
    that will build on top of them.
    This merge commit includes a change from Emil Goode
    (emilgoode@gmail.com) that fixes a warning that would
    have been introduced by this merge.  Specifically it
    fixes the pingv6_ops method ipv6_chk_addr() to add a
    "const" to the "struct net_device *dev" argument and
    likewise update the dummy_ipv6_chk_addr() declaration.
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
ping.h 3.63 KB