Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg Kroah-Hartman:
 "Here's the big char/misc driver patches for 3.9-rc1.

  Nothing major here, just lots of different driver updates (mei,
  hyperv, ipack, extcon, vmci, etc.).

  All of these have been in the linux-next tree for a while."

* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
  w1: w1_therm: Add force-pullup option for "broken" sensors
  w1: ds2482: Added 1-Wire pull-up support to the driver
  vme: add missing put_device() after device_register() fails
  extcon: max8997: Use workqueue to check cable state after completing boot of platform
  extcon: max8997: Set default UART/USB path on probe
  extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
  extcon: max8997: Set default of ADC debounce time during initialization
  extcon: max8997: Remove duplicate code related to set H/W line path
  extcon: max8997: Move defined constant to header file
  extcon: max77693: Make max77693_extcon_cable static
  extcon: max8997: Remove unreachable code
  extcon: max8997: Make max8997_extcon_cable static
  extcon: max77693: Remove unnecessary goto statement to improve readability
  extcon: max77693: Convert to devm_input_allocate_device()
  extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
  CREDITS: update email and address of Harald Hoyer
  extcon: arizona: Use MICDET for final microphone identification
  extcon: arizona: Always take the first HPDET reading as the final one
  extcon: arizona: Clear _trig_sts bits after jack detection
  extcon: arizona: Don't HPDET magic when headphones are enabled
  ...

2 files changed, 49 insertions, 54 deletions

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index d25a46925e61..c800ea4c8bf9 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -97,7 +97,7 @@ static struct utsname uts_buf;
  * The location of the interface configuration file.
  */
 
-#define KVP_CONFIG_LOC  "/var/opt/"
+#define KVP_CONFIG_LOC  "/var/lib/hyperv"
 
 #define MAX_FILE_NAME 100
 #define ENTRIES_PER_BLOCK 50
@@ -151,7 +151,7 @@ static void kvp_update_file(int pool)
          */
         kvp_acquire_lock(pool);
 
-        filep = fopen(kvp_file_info[pool].fname, "w");
+        filep = fopen(kvp_file_info[pool].fname, "we");
         if (!filep) {
                 kvp_release_lock(pool);
                 syslog(LOG_ERR, "Failed to open file, pool: %d", pool);
@@ -182,7 +182,7 @@ static void kvp_update_mem_state(int pool)
 
         kvp_acquire_lock(pool);
 
-        filep = fopen(kvp_file_info[pool].fname, "r");
+        filep = fopen(kvp_file_info[pool].fname, "re");
         if (!filep) {
                 kvp_release_lock(pool);
                 syslog(LOG_ERR, "Failed to open file, pool: %d", pool);
@@ -234,9 +234,9 @@ static int kvp_file_init(void)
         int i;
         int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
 
-        if (access("/var/opt/hyperv", F_OK)) {
-                if (mkdir("/var/opt/hyperv", S_IRUSR | S_IWUSR | S_IROTH)) {
-                        syslog(LOG_ERR, " Failed to create /var/opt/hyperv");
+        if (access(KVP_CONFIG_LOC, F_OK)) {
+                if (mkdir(KVP_CONFIG_LOC, 0755 /* rwxr-xr-x */)) {
+                        syslog(LOG_ERR, " Failed to create %s", KVP_CONFIG_LOC);
                         exit(EXIT_FAILURE);
                 }
         }
@@ -245,14 +245,14 @@ static int kvp_file_init(void)
                 fname = kvp_file_info[i].fname;
                 records_read = 0;
                 num_blocks = 1;
-                sprintf(fname, "/var/opt/hyperv/.kvp_pool_%d", i);
-                fd = open(fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IROTH);
+                sprintf(fname, "%s/.kvp_pool_%d", KVP_CONFIG_LOC, i);
+                fd = open(fname, O_RDWR | O_CREAT | O_CLOEXEC, 0644 /* rw-r--r-- */);
 
                 if (fd == -1)
                         return 1;
 
 
-                filep = fopen(fname, "r");
+                filep = fopen(fname, "re");
                 if (!filep)
                         return 1;
 
@@ -1162,16 +1162,13 @@ static int process_ip_string(FILE *f, char *ip_string, int type)
                                 snprintf(str, sizeof(str), "%s", "DNS");
                                 break;
                         }
-                        if (i != 0) {
-                                if (type != DNS) {
-                                        snprintf(sub_str, sizeof(sub_str),
-                                                "_%d", i++);
-                                } else {
-                                        snprintf(sub_str, sizeof(sub_str),
-                                                "%d", ++i);
-                                }
-                        } else if (type == DNS) {
+
+                        if (type == DNS) {
                                 snprintf(sub_str, sizeof(sub_str), "%d", ++i);
+                        } else if (type == GATEWAY && i == 0) {
+                                ++i;
+                        } else {
+                                snprintf(sub_str, sizeof(sub_str), "%d", i++);
                         }
 
 
@@ -1191,17 +1188,13 @@ static int process_ip_string(FILE *f, char *ip_string, int type)
                                 snprintf(str, sizeof(str), "%s",  "DNS");
                                 break;
                         }
-                        if ((j != 0) || (type == DNS)) {
-                                if (type != DNS) {
-                                        snprintf(sub_str, sizeof(sub_str),
-                                                "_%d", j++);
-                                } else {
-                                        snprintf(sub_str, sizeof(sub_str),
-                                                "%d", ++i);
-                                }
-                        } else if (type == DNS) {
-                                snprintf(sub_str, sizeof(sub_str),
-                                        "%d", ++i);
+
+                        if (type == DNS) {
+                                snprintf(sub_str, sizeof(sub_str), "%d", ++i);
+                        } else if (j == 0) {
+                                ++j;
+                        } else {
+                                snprintf(sub_str, sizeof(sub_str), "_%d", j++);
                         }
                 } else {
                         return  HV_INVALIDARG;
@@ -1244,18 +1237,19 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
          * Here is the format of the ip configuration file:
          *
          * HWADDR=macaddr
-         * IF_NAME=interface name
-         * DHCP=yes (This is optional; if yes, DHCP is configured)
+         * DEVICE=interface name
+         * BOOTPROTO=<protocol> (where <protocol> is "dhcp" if DHCP is configured
+         *                       or "none" if no boot-time protocol should be used)
          *
-         * IPADDR=ipaddr1
-         * IPADDR_1=ipaddr2
-         * IPADDR_x=ipaddry (where y = x + 1)
+         * IPADDR0=ipaddr1
+         * IPADDR1=ipaddr2
+         * IPADDRx=ipaddry (where y = x + 1)
          *
-         * NETMASK=netmask1
-         * NETMASK_x=netmasky (where y = x + 1)
+         * NETMASK0=netmask1
+         * NETMASKx=netmasky (where y = x + 1)
          *
          * GATEWAY=ipaddr1
-         * GATEWAY_x=ipaddry (where y = x + 1)
+         * GATEWAYx=ipaddry (where y = x + 1)
          *
          * DNSx=ipaddrx (where first DNS address is tagged as DNS1 etc)
          *
@@ -1271,7 +1265,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
          */
 
         snprintf(if_file, sizeof(if_file), "%s%s%s", KVP_CONFIG_LOC,
-                "hyperv/ifcfg-", if_name);
+                "/ifcfg-", if_name);
 
         file = fopen(if_file, "w");
 
@@ -1294,12 +1288,12 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
         if (error)
                 goto setval_error;
 
-        error = kvp_write_file(file, "IF_NAME", "", if_name);
+        error = kvp_write_file(file, "DEVICE", "", if_name);
         if (error)
                 goto setval_error;
 
         if (new_val->dhcp_enabled) {
-                error = kvp_write_file(file, "DHCP", "", "yes");
+                error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
                 if (error)
                         goto setval_error;
 
@@ -1307,6 +1301,11 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
                  * We are done!.
                  */
                 goto setval_done;
+
+        } else {
+                error = kvp_write_file(file, "BOOTPROTO", "", "none");
+                if (error)
+                        goto setval_error;
         }
 
         /*
diff --git a/tools/hv/hv_set_ifconfig.sh b/tools/hv/hv_set_ifconfig.sh
index 3e9427e08d80..735aafd64a3f 100755
--- a/tools/hv/hv_set_ifconfig.sh
+++ b/tools/hv/hv_set_ifconfig.sh
@@ -20,18 +20,19 @@
 # Here is the format of the ip configuration file:
 #
 # HWADDR=macaddr
-# IF_NAME=interface name
-# DHCP=yes (This is optional; if yes, DHCP is configured)
+# DEVICE=interface name
+# BOOTPROTO=<protocol> (where <protocol> is "dhcp" if DHCP is configured
+#                       or "none" if no boot-time protocol should be used)
 #
-# IPADDR=ipaddr1
-# IPADDR_1=ipaddr2
-# IPADDR_x=ipaddry (where y = x + 1)
+# IPADDR0=ipaddr1
+# IPADDR1=ipaddr2
+# IPADDRx=ipaddry (where y = x + 1)
 #
-# NETMASK=netmask1
-# NETMASK_x=netmasky (where y = x + 1)
+# NETMASK0=netmask1
+# NETMASKx=netmasky (where y = x + 1)
 #
 # GATEWAY=ipaddr1
-# GATEWAY_x=ipaddry (where y = x + 1)
+# GATEWAYx=ipaddry (where y = x + 1)
 #
 # DNSx=ipaddrx (where first DNS address is tagged as DNS1 etc)
 #
@@ -53,11 +54,6 @@ echo "NM_CONTROLLED=no" >> $1
 echo "PEERDNS=yes" >> $1
 echo "ONBOOT=yes" >> $1
 
-dhcp=$(grep "DHCP" $1 2>/dev/null)
-if [ "$dhcp" != "" ];
-then
-echo "BOOTPROTO=dhcp" >> $1;
-fi
 
 cp $1 /etc/sysconfig/network-scripts/
 
@@ -65,4 +61,4 @@ cp $1 /etc/sysconfig/network-scripts/
 interface=$(echo $1 | awk -F - '{ print $2 }')
 
 /sbin/ifdown $interface 2>/dev/null
-/sbin/ifup $interfac 2>/dev/null
+/sbin/ifup $interface 2>/dev/null