summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 03:10:17 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 03:10:17 +0300
commit7bb7a74886ce1f88d727ba46faa05edcdbacc192 (patch)
tree515e5c17d10578266850e97abbf0d46e788f446c /include
parent63e30271b04c712c684c07567401b61b10d094d4 (diff)
parentc988cabe2534b6efbf0cfab6d69e18855dc3409e (diff)
downloadlinux-7bb7a74886ce1f88d727ba46faa05edcdbacc192.tar.xz
Merge branch 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
Pull iscsi_ibft update from Konrad Rzeszutek Wilk: "A simple patch that had been rattling around in SuSE repo" * 'stable/for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft: iscsi_ibft: Add prefix-len attr and display netmask
Diffstat (limited to 'include')
-rw-r--r--include/linux/iscsi_boot_sysfs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/iscsi_boot_sysfs.h b/include/linux/iscsi_boot_sysfs.h
index 2a8b1659bf35..548d55395488 100644
--- a/include/linux/iscsi_boot_sysfs.h
+++ b/include/linux/iscsi_boot_sysfs.h
@@ -23,6 +23,7 @@ enum iscsi_boot_eth_properties_enum {
ISCSI_BOOT_ETH_INDEX,
ISCSI_BOOT_ETH_FLAGS,
ISCSI_BOOT_ETH_IP_ADDR,
+ ISCSI_BOOT_ETH_PREFIX_LEN,
ISCSI_BOOT_ETH_SUBNET_MASK,
ISCSI_BOOT_ETH_ORIGIN,
ISCSI_BOOT_ETH_GATEWAY,