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

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 98696a88fa1c..f91b8e77d543 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -726,10 +726,11 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
 {
         struct net_device *p = ds->ports[port].cpu_dp->master;
         struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
-        struct ethtool_wolinfo pwol;
+        struct ethtool_wolinfo pwol = { };
 
         /* Get the parent device WoL settings */
-        p->ethtool_ops->get_wol(p, &pwol);
+        if (p->ethtool_ops->get_wol)
+                p->ethtool_ops->get_wol(p, &pwol);
 
         /* Advertise the parent device supported settings */
         wol->supported = pwol.supported;
@@ -750,9 +751,10 @@ static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,
         struct net_device *p = ds->ports[port].cpu_dp->master;
         struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
         s8 cpu_port = ds->ports[port].cpu_dp->index;
-        struct ethtool_wolinfo pwol;
+        struct ethtool_wolinfo pwol =  { };
 
-        p->ethtool_ops->get_wol(p, &pwol);
+        if (p->ethtool_ops->get_wol)
+                p->ethtool_ops->get_wol(p, &pwol);
         if (wol->wolopts & ~pwol.supported)
                 return -EINVAL;