diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-09 05:07:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-09 05:07:53 +0200 |
| commit | 53af53ae83fe960ceb9ef74cac7915e9088f4266 (patch) | |
| tree | 0cd5309f2a931d3f210aa3d2025aae64f2276e8c /arch/sparc | |
| parent | Revert "veth: Showing peer of veth type dev in ip link (kernel side)" (diff) | |
| parent | Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (diff) | |
| download | linux-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.xz linux-53af53ae83fe960ceb9ef74cac7915e9088f4266.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/net/bpf_jit_comp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index 9c7be59e6f5a..218b6b23c378 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c @@ -808,4 +808,5 @@ void bpf_jit_free(struct sk_filter *fp) { if (fp->bpf_func != sk_run_filter) module_free(NULL, fp->bpf_func); + kfree(fp); } |