From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 Jun 2019 18:00:14 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6cdeeb16bff89c8486324f53577db058cbe81ba;p=android-x86%2Fkernel.git

Merge git://git./linux/kernel/git/davem/net

Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.

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

a6cdeeb16bff89c8486324f53577db058cbe81ba
diff --cc drivers/net/phy/phylink.c
index f5b97dab3017,4c0616ba314d..5d0af041b8f9
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -1695,21 -1606,23 +1698,23 @@@ static int phylink_sfp_module_insert(vo
  		return ret;
  	}
  
+ 	linkmode_copy(support1, support);
+ 
  	iface = sfp_select_interface(pl->sfp_bus, id, config.advertising);
  	if (iface == PHY_INTERFACE_MODE_NA) {
 -		netdev_err(pl->netdev,
 -			   "selection of interface failed, advertisement %*pb\n",
 -			   __ETHTOOL_LINK_MODE_MASK_NBITS, config.advertising);
 +		phylink_err(pl,
 +			    "selection of interface failed, advertisement %*pb\n",
 +			    __ETHTOOL_LINK_MODE_MASK_NBITS, config.advertising);
  		return -EINVAL;
  	}
  
  	config.interface = iface;
- 	ret = phylink_validate(pl, support, &config);
+ 	ret = phylink_validate(pl, support1, &config);
  	if (ret) {
 -		netdev_err(pl->netdev, "validation of %s/%s with support %*pb failed: %d\n",
 -			   phylink_an_mode_str(MLO_AN_INBAND),
 -			   phy_modes(config.interface),
 -			   __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
 +		phylink_err(pl, "validation of %s/%s with support %*pb failed: %d\n",
 +			    phylink_an_mode_str(MLO_AN_INBAND),
 +			    phy_modes(config.interface),
 +			    __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
  		return ret;
  	}
  
diff --cc include/net/tls.h
index d1a4f365d6be,4a55ce6a303f..3ecf45adb707
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@@ -207,8 -206,13 +207,12 @@@ struct tls_offload_context_tx 
  };
  
  #define TLS_OFFLOAD_CONTEXT_SIZE_TX                                            \
 -	(ALIGN(sizeof(struct tls_offload_context_tx), sizeof(void *)) +        \
 -	 TLS_DRIVER_STATE_SIZE)
 +	(sizeof(struct tls_offload_context_tx) + TLS_DRIVER_STATE_SIZE_TX)
  
+ enum tls_context_flags {
+ 	TLS_RX_SYNC_RUNNING = 0,
+ };
+ 
  struct cipher_context {
  	char *iv;
  	char *rec_seq;