Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 0 deletions

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index b3c52e3f689a..8ae3ed97d95c 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)
         if (llc->cmsg_flags & LLC_CMSG_PKTINFO) {
                 struct llc_pktinfo info;
 
+                memset(&info, 0, sizeof(info));
                 info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex;
                 llc_pdu_decode_dsap(skb, &info.lpi_sap);
                 llc_pdu_decode_da(skb, info.lpi_mac);