diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-28 13:22:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-28 13:22:54 +0200 |
| commit | b230f517500e6dc358ba65dafb4a6ed18449500e (patch) | |
| tree | 7eebcca8ddb0ff9ee971698616c11219cba43ca4 /drivers/net/xen-netback/xenbus.c | |
| parent | f5978a07daf67b25d101caa42ab3b18f0edf3dde (diff) | |
| parent | 47127fcd287c91397d11bcf697d12c79169528f2 (diff) | |
Merge 4.4.268 into android-4.4-p
Changes in 4.4.268
net/sctp: fix race condition in sctp_destroy_sock
Input: nspire-keypad - enable interrupts only when opened
dmaengine: dw: Make it dependent to HAS_IOMEM
ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
arc: kernel: Return -EFAULT if copy_to_user() fails
neighbour: Disregard DEAD dst in neigh_update
ARM: keystone: fix integer overflow warning
ASoC: fsl_esai: Fix TDM slot setup for I2S mode
net: ieee802154: stop dump llsec keys for monitors
net: ieee802154: stop dump llsec devs for monitors
net: ieee802154: forbid monitor for add llsec dev
net: ieee802154: stop dump llsec devkeys for monitors
net: ieee802154: forbid monitor for add llsec devkey
net: ieee802154: stop dump llsec seclevels for monitors
net: ieee802154: forbid monitor for add llsec seclevel
pcnet32: Use pci_resource_len to validate PCI resource
Input: i8042 - fix Pegatron C15B ID entry
scsi: libsas: Reset num_scatter if libata marks qc as NODATA
net: davicom: Fix regulator not turned off on failed probe
i40e: fix the panic when running bpf in xdpdrv mode
ARM: 9071/1: uprobes: Don't hook on thumb instructions
net: hso: fix null-ptr-deref during tty device unregistration
ext4: correct error label in ext4_rename()
ARM: dts: Fix swapped mmc order for omap3
s390/entry: save the caller of psw_idle
xen-netback: Check for hotplug-status existence before watching
cavium/liquidio: Fix duplicate argument
ia64: fix discontig.c section mismatches
ia64: tools: remove duplicate definition of ia64_mf() on ia64
compiler.h: enable builtin overflow checkers and add fallback code
overflow.h: Add allocation size calculation helpers
x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
net: hso: fix NULL-deref on disconnect regression
Linux 4.4.268
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I98c94e88153f3a181e39ce6eed3c983c356d5b94
Diffstat (limited to 'drivers/net/xen-netback/xenbus.c')
| -rw-r--r-- | drivers/net/xen-netback/xenbus.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 21c8e2720b40..683fd8560f2b 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -849,11 +849,15 @@ static void connect(struct backend_info *be) xenvif_carrier_on(be->vif); unregister_hotplug_status_watch(be); - err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, NULL, - hotplug_status_changed, - "%s/%s", dev->nodename, "hotplug-status"); - if (!err) + if (xenbus_exists(XBT_NIL, dev->nodename, "hotplug-status")) { + err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, + NULL, hotplug_status_changed, + "%s/%s", dev->nodename, + "hotplug-status"); + if (err) + goto err; be->have_hotplug_status_watch = 1; + } netif_tx_wake_all_queues(be->vif->dev); |