Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / drivers / scsi / fcoe / fcoe_sysfs.c

diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
index 045c4e1..0675fd1 100644 (file)
--- a/drivers/scsi/fcoe/fcoe_sysfs.c
+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -385,6 +385,44 @@ static FCOE_DEVICE_ATTR(ctlr, enabled, S_IRUGO | S_IWUSR,
                        show_ctlr_enabled_state,
                        store_ctlr_enabled);
 
+static ssize_t store_ctlr_fip_resp(struct device *dev,
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+       struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+       struct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr);
+
+       mutex_lock(&fip->ctlr_mutex);
+       if ((buf[1] == '\0') || ((buf[1] == '\n') && (buf[2] == '\0'))) {
+               if (buf[0] == '1') {
+                       fip->fip_resp = 1;
+                       mutex_unlock(&fip->ctlr_mutex);
+                       return count;
+               }
+               if (buf[0] == '0') {
+                       fip->fip_resp = 0;
+                       mutex_unlock(&fip->ctlr_mutex);
+                       return count;
+               }
+       }
+       mutex_unlock(&fip->ctlr_mutex);
+       return -EINVAL;
+}
+
+static ssize_t show_ctlr_fip_resp(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+       struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+       struct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr);
+
+       return sprintf(buf, "%d\n", fip->fip_resp ? 1 : 0);
+}
+
+static FCOE_DEVICE_ATTR(ctlr, fip_vlan_responder, S_IRUGO | S_IWUSR,
+                       show_ctlr_fip_resp,
+                       store_ctlr_fip_resp);
+
 static ssize_t
 store_private_fcoe_ctlr_fcf_dev_loss_tmo(struct device *dev,
                                         struct device_attribute *attr,
@@ -467,6 +505,7 @@ static struct attribute_group fcoe_ctlr_lesb_attr_group = {
 };
 
 static struct attribute *fcoe_ctlr_attrs[] = {
+       &device_attr_fcoe_ctlr_fip_vlan_responder.attr,
        &device_attr_fcoe_ctlr_fcf_dev_loss_tmo.attr,
        &device_attr_fcoe_ctlr_enabled.attr,
        &device_attr_fcoe_ctlr_mode.attr,