Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53af53ae authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b343ca84 9684d7b0

Documentation/connector/ucon.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg) 
	nlh->nlmsg_seq = seq++;

	nlh->nlmsg_pid = getpid();

	nlh->nlmsg_type = NLMSG_DONE;

	nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));

	nlh->nlmsg_len = size;

	nlh->nlmsg_flags = 0;



	m = NLMSG_DATA(nlh);

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1785,6 +1785,7 @@ F: include/net/bluetooth/ 


BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

M:	Veaceslav Falico <vfalico@redhat.com>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/

arch/arm/net/bpf_jit_32.c

+1 −0
Original line number Diff line number Diff line
@@ -930,4 +930,5 @@ void bpf_jit_free(struct sk_filter *fp) 
{

	if (fp->bpf_func != sk_run_filter)

		module_free(NULL, fp->bpf_func);

	kfree(fp);

}

arch/powerpc/net/bpf_jit_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -691,4 +691,5 @@ void bpf_jit_free(struct sk_filter *fp) 
{

	if (fp->bpf_func != sk_run_filter)

		module_free(NULL, fp->bpf_func);

	kfree(fp);

}

arch/s390/net/bpf_jit_comp.c

+3 −1
Original line number Diff line number Diff line
@@ -881,7 +881,9 @@ void bpf_jit_free(struct sk_filter *fp) 
	struct bpf_binary_header *header = (void *)addr;



	if (fp->bpf_func == sk_run_filter)

		return;

		goto free_filter;

	set_memory_rw(addr, header->pages);

	module_free(NULL, header);

free_filter:

	kfree(fp);

}