forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse source 
Conflicts:
	drivers/net/wireless/rtlwifi/pci.c
	include/linux/netlink.h
This commit is contained in:
John W. Linville 2011-06-24 15:25:51 -04:00
commit 36099365c7
185 changed files with 7525 additions and 3619 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/netlink.h
View file

@ -49,6 +49,7 @@ struct nlmsghdr {
#define NLM_F_MULTI 2 /* Multipart message, terminated by NLMSG_DONE */
#define NLM_F_ACK 4 /* Reply with ack, with zero or error code */
#define NLM_F_ECHO 8 /* Echo this request */
#define NLM_F_DUMP_INTR 16 /* Dump was inconsistent due to sequence change */
/* Modifiers to GET request */
#define NLM_F_ROOT 0x100 /* specify tree root */
@ -223,6 +224,7 @@ struct netlink_callback {
int (*done)(struct netlink_callback *cb);
u16 family;
u16 min_dump_alloc;
unsigned int prev_seq, seq;
long args[6];
};