diff --git a/[refs] b/[refs] index 41fad47def01..3643651f3047 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd19f329a32bdc4eb07885e0b3889567cfe00aa7 +refs/heads/master: b461d2f2188c1c578ed651e4cdf608be7a993cd4 diff --git a/trunk/include/net/genetlink.h b/trunk/include/net/genetlink.h index 52d8b1a73d52..c5b96b2b8155 100644 --- a/trunk/include/net/genetlink.h +++ b/trunk/include/net/genetlink.h @@ -60,7 +60,7 @@ struct genl_info */ struct genl_ops { - unsigned int cmd; + u8 cmd; unsigned int flags; struct nla_policy *policy; int (*doit)(struct sk_buff *skb, diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c index 287cfcc56951..3b1378498d50 100644 --- a/trunk/net/netlink/genetlink.c +++ b/trunk/net/netlink/genetlink.c @@ -441,7 +441,7 @@ static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb) } static struct sk_buff *ctrl_build_msg(struct genl_family *family, u32 pid, - int seq, int cmd) + int seq, u8 cmd) { struct sk_buff *skb; int err;