diff --git a/[refs] b/[refs] index 5772dbb2cbc0..b804e351fcfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30099b2e9b3a1f88250d31472edf2b6d6f0a7d8b +refs/heads/master: c9d2ea96ca3bbc85264803ff6bd66eb3bbefdb77 diff --git a/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h index b3dc992fb25b..f80c56ac4d82 100644 --- a/trunk/include/linux/netlink.h +++ b/trunk/include/linux/netlink.h @@ -183,10 +183,10 @@ extern void netlink_table_ungrab(void); /* optional Netlink kernel configuration parameters */ struct netlink_kernel_cfg { unsigned int groups; + unsigned int flags; void (*input)(struct sk_buff *skb); struct mutex *cb_mutex; void (*bind)(int group); - unsigned int flags; }; extern struct sock *__netlink_kernel_create(struct net *net, int unit,