w1: optional bundling of netlink kernel replies

Applications can submit a set of commands in one packet to the kernel,
and in some cases it is required such as reading the temperature
sensor results.  This adds an option W1_CN_BUNDLE to the flags of
cn_msg to request the kernel to reply in one packet for efficiency.

The cn_msg flags now check for unknown flag values and return an error
if one is seen.  See "Proper handling of unknown flags in system
calls" http://lwn.net/Articles/588444/

This corrects the ack values returned as per the protocol standard,
namely the original ack for status messages and seq + 1 for all others
such as the data returned from a read.

Some of the common variable names have been standardized as follows.
struct cn_msg *cn
struct w1_netlink_msg *msg
struct w1_netlink_cmd *cmd
struct w1_master *dev

When an argument and a function scope variable would collide, add req_
to the argument.

Signed-off-by: David Fries <David@Fries.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 734dab7fc687..56a49ba41d83 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -203,7 +203,6 @@ enum w1_master_flags {
  * @search_id:          allows continuing a search
  * @refcnt:             reference count
  * @priv:               private data storage
- * @priv_size:          size allocated
  * @enable_pullup:      allows a strong pullup
  * @pullup_duration:    time for the next strong pullup
  * @flags:              one of w1_master_flags
@@ -214,7 +213,6 @@ enum w1_master_flags {
  * @dev:                sysfs device
  * @bus_master:         io operations available
  * @seq:                sequence number used for netlink broadcasts
- * @portid:             destination for the current netlink command
  */
 struct w1_master
 {
@@ -241,7 +239,6 @@ struct w1_master
         atomic_t                refcnt;
 
         void                    *priv;
-        int                     priv_size;
 
         /** 5V strong pullup enabled flag, 1 enabled, zero disabled. */
         int                     enable_pullup;
@@ -260,11 +257,6 @@ struct w1_master
         struct w1_bus_master    *bus_master;
 
         u32                     seq;
-        /* port id to send netlink responses to.  The value is temporarily
-         * stored here while processing a message, set after locking the
-         * mutex, zero before unlocking the mutex.
-         */
-        u32                     portid;
 };
 
 /**