Patched in Tegra support.

1 files changed, 44 insertions, 21 deletions

diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index bdfbe68c1c3..82d8d09faa4 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -5,8 +5,6 @@
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 
-#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)
-
 /**
  * struct genl_multicast_group - generic netlink multicast group
  * @name: name of the multicast group, names are per-family
@@ -65,7 +63,7 @@ struct genl_family {
 /**
  * struct genl_info - receiving information
  * @snd_seq: sending sequence number
- * @snd_portid: netlink portid of sender
+ * @snd_pid: netlink pid of sender
  * @nlhdr: netlink message header
  * @genlhdr: generic netlink message header
  * @userhdr: user specific header
@@ -75,7 +73,7 @@ struct genl_family {
  */
 struct genl_info {
         u32                     snd_seq;
-        u32                     snd_portid;
+        u32                     snd_pid;
         struct nlmsghdr *       nlhdr;
         struct genlmsghdr *     genlhdr;
         void *                  userhdr;
@@ -130,11 +128,36 @@ extern int genl_register_mc_group(struct genl_family *family,
                                   struct genl_multicast_group *grp);
 extern void genl_unregister_mc_group(struct genl_family *family,
                                      struct genl_multicast_group *grp);
-extern void genl_notify(struct sk_buff *skb, struct net *net, u32 portid,
-                        u32 group, struct nlmsghdr *nlh, gfp_t flags);
 
-void *genlmsg_put(struct sk_buff *skb, u32 portid, u32 seq,
-                                struct genl_family *family, int flags, u8 cmd);
+/**
+ * genlmsg_put - Add generic netlink header to netlink message
+ * @skb: socket buffer holding the message
+ * @pid: netlink pid the message is addressed to
+ * @seq: sequence number (usually the one of the sender)
+ * @family: generic netlink family
+ * @flags netlink message flags
+ * @cmd: generic netlink command
+ *
+ * Returns pointer to user specific header
+ */
+static inline void *genlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
+                                struct genl_family *family, int flags, u8 cmd)
+{
+        struct nlmsghdr *nlh;
+        struct genlmsghdr *hdr;
+
+        nlh = nlmsg_put(skb, pid, seq, family->id, GENL_HDRLEN +
+                        family->hdrsize, flags);
+        if (nlh == NULL)
+                return NULL;
+
+        hdr = nlmsg_data(nlh);
+        hdr->cmd = cmd;
+        hdr->version = family->version;
+        hdr->reserved = 0;
+
+        return (char *) hdr + GENL_HDRLEN;
+}
 
 /**
  * genlmsg_nlhdr - Obtain netlink header from user specified header
@@ -183,7 +206,7 @@ static inline void *genlmsg_put_reply(struct sk_buff *skb,
                                       struct genl_family *family,
                                       int flags, u8 cmd)
 {
-        return genlmsg_put(skb, info->snd_portid, info->snd_seq, family,
+        return genlmsg_put(skb, info->snd_pid, info->snd_seq, family,
                            flags, cmd);
 }
 
@@ -212,49 +235,49 @@ static inline void genlmsg_cancel(struct sk_buff *skb, void *hdr)
  * genlmsg_multicast_netns - multicast a netlink message to a specific netns
  * @net: the net namespace
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  */
 static inline int genlmsg_multicast_netns(struct net *net, struct sk_buff *skb,
-                                          u32 portid, unsigned int group, gfp_t flags)
+                                          u32 pid, unsigned int group, gfp_t flags)
 {
-        return nlmsg_multicast(net->genl_sock, skb, portid, group, flags);
+        return nlmsg_multicast(net->genl_sock, skb, pid, group, flags);
 }
 
 /**
  * genlmsg_multicast - multicast a netlink message to the default netns
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  */
-static inline int genlmsg_multicast(struct sk_buff *skb, u32 portid,
+static inline int genlmsg_multicast(struct sk_buff *skb, u32 pid,
                                     unsigned int group, gfp_t flags)
 {
-        return genlmsg_multicast_netns(&init_net, skb, portid, group, flags);
+        return genlmsg_multicast_netns(&init_net, skb, pid, group, flags);
 }
 
 /**
  * genlmsg_multicast_allns - multicast a netlink message to all net namespaces
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  *
  * This function must hold the RTNL or rcu_read_lock().
  */
-int genlmsg_multicast_allns(struct sk_buff *skb, u32 portid,
+int genlmsg_multicast_allns(struct sk_buff *skb, u32 pid,
                             unsigned int group, gfp_t flags);
 
 /**
  * genlmsg_unicast - unicast a netlink message
  * @skb: netlink message as socket buffer
- * @portid: netlink portid of the destination socket
+ * @pid: netlink pid of the destination socket
  */
-static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 portid)
+static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 pid)
 {
-        return nlmsg_unicast(net->genl_sock, skb, portid);
+        return nlmsg_unicast(net->genl_sock, skb, pid);
 }
 
 /**
@@ -264,7 +287,7 @@ static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 port
  */
 static inline int genlmsg_reply(struct sk_buff *skb, struct genl_info *info)
 {
-        return genlmsg_unicast(genl_info_net(info), skb, info->snd_portid);
+        return genlmsg_unicast(genl_info_net(info), skb, info->snd_pid);
 }
 
 /**