diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 01:06:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 01:06:18 -0400 |
| commit | 268d2b3e25b86514634a8c6cd97ee95f43213963 (patch) | |
| tree | c31e58d5c5cd4e64514455c44d628993aba1510b | |
| parent | 6dc1337d37430e39094cba53ec94e0c50a251210 (diff) | |
| download | longterm-queue-4.12-268d2b3e25b86514634a8c6cd97ee95f43213963.tar.gz | |
net: ibmvnic ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ibmvnic-Set-state-UP.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/ibmvnic-Set-state-UP.patch b/queue/ibmvnic-Set-state-UP.patch index b85b8ce..19439a7 100644 --- a/queue/ibmvnic-Set-state-UP.patch +++ b/queue/ibmvnic-Set-state-UP.patch @@ -1,4 +1,4 @@ -From e876a8a7e9dd89dc88c12ca2e81beb478dbe9897 Mon Sep 17 00:00:00 2001 +From ecdea16d9237c99ead490e19e59812c00253d2b8 Mon Sep 17 00:00:00 2001 From: Mick Tarsel <mjtarsel@linux.vnet.ibm.com> Date: Thu, 28 Sep 2017 13:53:18 -0700 Subject: [PATCH] ibmvnic: Set state UP @@ -11,12 +11,13 @@ order to set the state to UP. Signed-off-by: Mick Tarsel <mjtarsel@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c -index cb8182f4fdfa..4bc14a901571 100644 +index c0fbeb387db4..40f71fbd339b 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -927,6 +927,7 @@ static int ibmvnic_open(struct net_device *netdev) +@@ -738,6 +738,7 @@ static int ibmvnic_open(struct net_device *netdev) } rc = __ibmvnic_open(netdev); @@ -24,9 +25,9 @@ index cb8182f4fdfa..4bc14a901571 100644 mutex_unlock(&adapter->reset_lock); return rc; -@@ -3899,6 +3900,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) - if (rc) - goto ibmvnic_init_fail; +@@ -3540,6 +3541,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) + + netdev->mtu = adapter->req_mtu - ETH_HLEN; + netif_carrier_off(netdev); rc = register_netdev(netdev); |